twaalgos: Set 'dicho' algo as default for SAT-based minimization
* python/spot/__init__.py: Handle options. * spot/twaalgos/dtwasat.cc: Handle options. * spot/twaalgos/postproc.cc: Handle options. * spot/twaalgos/postproc.hh: Handle options. * tests/core/satmin.test: Update tests. Now use 'sat-minimize=4' to use the naive algo. * tests/core/satmin2.test: Update tests. Now use --sat-minimize='naive' to use the naive algo. * tests/python/satmin.py: Update tests. Now use 'naive=True' to use the naive algo.
This commit is contained in:
parent
67e3a4f28e
commit
ef2355a542
7 changed files with 365 additions and 376 deletions
|
|
@ -61,37 +61,37 @@ diff output expected
|
|||
ltl2tgba -BD -x sat-minimize "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x sat-minimize=2 "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize,sat-langmap' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=2,langmap' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=2, sat-incr-steps=0' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=4,param=0' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=2, sat-incr-steps=1' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=4,param=1' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=2, sat-incr-steps=2' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=4,param=2' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=2, sat-incr-steps=50' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=4,param=50' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=3, sat-incr-steps=-1' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=3,param=-1' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=3, sat-incr-steps=0' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=3,param=-0' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=3, sat-incr-steps=1' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=3,param=1' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=3, sat-incr-steps=2' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=3,param=2' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x 'sat-minimize=3, sat-incr-steps=50' "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
ltl2tgba -BD -x 'sat-minimize=3,param=50' "GF(a <-> XXb)" -H >out
|
||||
ltl2tgba -BD -x sat-minimize=4 "GF(a <-> XXb)" -H >out
|
||||
grep 'properties:.*state-acc' out
|
||||
grep 'properties:.*deterministic' out
|
||||
|
||||
|
|
@ -134,77 +134,78 @@ EOF
|
|||
# automata.
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"' test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='dicho,acc="Fin(0)|Inf(1)"' test.hoa --stats=%s >output
|
||||
$autfilt --sat-minimize='sat-langmap,acc="Fin(0)|Inf(1)"' test.hoa --stats=%s \
|
||||
>output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='dicho,langmap,acc="Fin(0)|Inf(1)"' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=0' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=0' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=1' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=1' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=2' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=2' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=50' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=50' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=-1' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=-1' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=0' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=0' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=1' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=1' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=2' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=2' test.hoa \
|
||||
--stats=%s >output
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=50' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=50' test.hoa \
|
||||
$autfilt --sat-minimize='sat-naive,acc="Fin(0)|Inf(1)"' test.hoa \
|
||||
--stats=%s >output
|
||||
test `cat output` = 1
|
||||
|
||||
|
||||
# How about a state-based DSA?
|
||||
# How about a state-based DSA ?
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)"' test.hoa \
|
||||
--stats=%s > output
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='dicho,acc="Fin(0)|Inf(1)"' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='dicho,langmap,acc="Fin(0)|Inf(1)"' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=0' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=1' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=2' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",assume,param=50' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=-1' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=0' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=1' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=2' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)",incr,param=50' test.hoa \
|
||||
--stats=%s > output
|
||||
$autfilt -S --sat-minimize='sat-langmap,acc="Fin(0)|Inf(1)"' test.hoa \
|
||||
--stats=%s > output
|
||||
test `cat output` = 3
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=0' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=1' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=2' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-incr=1,sat-incr-steps=50' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=-1' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=0' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=1' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=2' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)"sat-incr=2,sat-incr-steps=50' \
|
||||
test.hoa --stats=%s >output
|
||||
test `cat output` = 1
|
||||
$autfilt --sat-minimize='acc="Fin(0)|Inf(1)",sat-naive' test.hoa \
|
||||
--stats=%s >output
|
||||
test `cat output` = 1
|
||||
|
||||
|
||||
# How about a state-based DPA?
|
||||
|
|
@ -216,7 +217,7 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,dicho' -H \
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,sat-langmap' -H \
|
||||
test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -224,15 +225,8 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,dicho,langmap' -H \
|
||||
test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
grep 'States: 3' output
|
||||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,assume,param=0' \
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=1,sat-incr-steps=0' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -240,7 +234,8 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,assume,param=1' \
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=1,sat-incr-steps=1' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -248,7 +243,8 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,assume,param=2' \
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=1,sat-incr-steps=2' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -256,7 +252,26 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,assume,param=50' \
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=1,sat-incr-steps=50'\
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
grep 'States: 3' output
|
||||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=2,sat-incr-steps=-1'\
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
grep 'States: 3' output
|
||||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=2,sat-incr-steps=0' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -264,7 +279,8 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,incr,param=-1' \
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=2,sat-incr-steps=1' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -272,7 +288,8 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,incr,param=0' \
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=2,sat-incr-steps=2' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -280,23 +297,16 @@ grep 'States: 3' output
|
|||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,incr,param=1' \
|
||||
-H test.hoa > output
|
||||
$autfilt -S \
|
||||
--sat-minimize='acc="parity max even 3",colored,sat-incr=2,sat-incr-steps=50'\
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
grep 'States: 3' output
|
||||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,incr,param=2' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
grep 'States: 3' output
|
||||
grep 'acc-name: parity max even 3' output
|
||||
grep 'Acceptance: 3 Inf(2) | (Fin(1) & Inf(0))' output
|
||||
test 3 = `grep -c 'State: [012] {[012]}' output`
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,incr,param=50' \
|
||||
$autfilt -S --sat-minimize='acc="parity max even 3",colored,sat-naive' \
|
||||
-H test.hoa > output
|
||||
cat output
|
||||
grep 'properties:.*colored' output
|
||||
|
|
@ -339,27 +349,27 @@ State: 0
|
|||
EOF
|
||||
$autfilt -H --sat-minimize special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='dicho' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-langmap' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='dicho,langmap' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=1,sat-incr-steps=0' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='assume,param=0' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=1,sat-incr-steps=1' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='assume,param=1' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=1,sat-incr-steps=2' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='assume,param=2' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=1,sat-incr-steps=50' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='assume,param=50' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=2,sat-incr-steps=-1' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='incr,param=-1' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=2,sat-incr-steps=0' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='incr,param=0' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=2,sat-incr-steps=1' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='incr,param=1' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=2,sat-incr-steps=2' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='incr,param=2' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-incr=2,sat-incr-steps=50' special.hoa > output
|
||||
diff output expected
|
||||
$autfilt -H --sat-minimize='incr,param=50' special.hoa > output
|
||||
$autfilt -H --sat-minimize='sat-naive' special.hoa > output
|
||||
diff output expected
|
||||
|
||||
|
||||
|
|
@ -380,37 +390,46 @@ EOF
|
|||
$autfilt --sat-minimize='acc="Streett 1",max-states=2' foo.hoa \
|
||||
--stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,dicho' foo.hoa \
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,sat-langmap' foo.hoa \
|
||||
--stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,dicho,langmap' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=1,sat-incr-steps=0' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,assume,param=0' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=1,sat-incr-steps=1' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,assume,param=1' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=1,sat-incr-steps=2' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,assume,param=2' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=1,sat-incr-steps=50' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,assume,param=50' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=2,sat-incr-steps=-1' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,incr,param=-1' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=2,sat-incr-steps=0' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,incr,param=0' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=2,sat-incr-steps=1' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,incr,param=1' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=2,sat-incr-steps=2' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,incr,param=2' foo.hoa \
|
||||
--stats=%s >out
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Streett 1",max-states=2,sat-incr=2,sat-incr-steps=50' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,incr,param=50' foo.hoa \
|
||||
$autfilt --sat-minimize='acc="Streett 1",max-states=2,sat-naive' foo.hoa \
|
||||
--stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
|
||||
|
|
@ -418,74 +437,86 @@ test "`cat out`" = 1
|
|||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,dicho' foo.hoa \
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,sat-langmap' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,dicho,langmap' foo.hoa \
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4,sat-incr=1,sat-incr-steps=0' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4,sat-incr=1,sat-incr-steps=1' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4,sat-incr=1,sat-incr-steps=2' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4,sat-incr=1,sat-incr-steps=50' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4sat-incr=2,sat-incr-steps=-1' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4sat-incr=2,sat-incr-steps=0' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4sat-incr=2,sat-incr-steps=1' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4sat-incr=2,sat-incr-steps=2' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt \
|
||||
--sat-minimize='acc="Rabin 1",max-states=4sat-incr=2,sat-incr-steps=50' \
|
||||
foo.hoa --stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,sat-naive' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,assume,param=0' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,assume,param=1' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,assume,param=2' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,assume,param=50' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,incr,param=-1' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,incr,param=0' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,incr,param=1' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,incr,param=2' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
$autfilt --sat-minimize='acc="Rabin 1",max-states=4,incr,param=50' foo.hoa \
|
||||
--stats=%s >out && exit 1
|
||||
test -z "`cat out`"
|
||||
|
||||
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1' foo.hoa \
|
||||
--stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,dicho' foo.hoa \
|
||||
--stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,dicho,langmap' \
|
||||
|
||||
|
||||
options='acc="Inf(0)&Fin(1)|Inf(2)",states=1'
|
||||
|
||||
$autfilt --sat-minimize=$options',sat-langmap' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,assume,param=0' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=1,sat-incr-steps=0' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,assume,param=1' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=1,sat-incr-steps=1' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,assume,param=2' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=1,sat-incr-steps=2' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,assume,param=50' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=1,sat-incr-steps=50' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,incr,param=-1' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=2,sat-incr-steps=-1' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,incr,param=0' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=2,sat-incr-steps=0' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,incr,param=1' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=2,sat-incr-steps=1' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,incr,param=2' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=2,sat-incr-steps=2' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize='acc="Inf(0)&Fin(1)|Inf(2)",states=1,incr,param=50' \
|
||||
$autfilt --sat-minimize=$options',sat-incr=2,sat-incr-steps=50' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
$autfilt --sat-minimize=$options',sat-naive' \
|
||||
foo.hoa --stats=%s >out
|
||||
test "`cat out`" = 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue