alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

product: optimize product with weak automata

Browse source 
Fixes #350.

* spot/twaalgos/product.cc: Implement this change.
* NEWS, spot/twaalgos/product.hh: Mention it.
* spot/twa/acc.cc, spot/twa/acc.hh (acc_cond::sat_mark): New method.
* tests/python/_product_weak.ipynb: New file.
* tests/Makefile.am: Add it.
* tests/python/automata.ipynb, tests/python/highlighting.ipynb,
tests/python/product.ipynb, tests/core/prodor.test: Adjust test cases.
This commit is contained in:
Alexandre Duret-Lutz 2018-05-23 18:34:31 +02:00
parent b655038803
commit a738801edf
11 changed files with 15348 additions and 1605 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/core/prodor.test
View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2015, 2017 Laboratoire de Recherche et Développement
# Copyright (C) 2015, 2017, 2018 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -106,6 +106,7 @@ diff pand.hoa exp
test 2 = `autfilt -c --intersect pand.hoa gfa.hoa fgb.hoa`
# Xb is weak, so the product will still be Büchi
ltl2tgba -BDH 'GFa' > gfa.hoa
ltl2tgba -BDH 'Xb' > xb.hoa
autfilt --product-or gfa.hoa xb.hoa -H > por.hoa
@ -116,14 +117,15 @@ HOA: v1
States: 7
Start: 0
AP: 2 "a" "b"
Acceptance: 2 Inf(0) | Inf(1)
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc complete
properties: deterministic
--BODY--
State: 0 {1}
State: 0 {0}
[0] 1
[!0] 2
State: 1 {1}
State: 1 {0}
[0&1] 3
[!0&1] 4
[0&!1] 5
@ -133,13 +135,13 @@ State: 2
[!0&1] 4
[0&!1] 5
[!0&!1] 6
State: 3 {0 1}
State: 3 {0}
[0] 3
[!0] 4
State: 4 {0}
[0] 3
[!0] 4
State: 5 {1}
State: 5 {0}
[0] 5
[!0] 6
State: 6
@ -159,14 +161,15 @@ HOA: v1
States: 7
Start: 0
AP: 2 "a" "b"
Acceptance: 2 Inf(0) | Inf(1)
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc complete
properties: deterministic
--BODY--
State: 0 {0 1}
State: 0 {0}
[0] 1
[!0] 2
State: 1 {0 1}
State: 1 {0}
[0&1] 3
[!0&1] 4
[0&!1] 5
@ -176,13 +179,13 @@ State: 2 {0}
[!0&1] 4
[0&!1] 5
[!0&!1] 6
State: 3 {0 1}
State: 3 {0}
[0] 3
[!0] 4
State: 4 {0}
[0] 3
[!0] 4
State: 5 {1}
State: 5 {0}
[0] 5
[!0] 6
State: 6