DVE2: preliminary implementation of compressed states.
* iface/dve2/dve2.cc (dve2_compressed_state): New class. (callback_context): Deal with general state*s, not dve2_state*s. (transition_callback_compress): New function. (dve2_kripke): Take a compress option. (get_init_state, compute_state_condition, succ_iter, format_state, state_condition): Handle compressed states. (get_vars, compute_state_condition_aux): New helper methods. * iface/dve2/dve2.hh (load_dve2): Add a compress option. * iface/dve2/dve2check.cc: Add a -z option. * iface/dve2/finite.test, iface/dve2/dve2check.test: Add more tests.
This commit is contained in:
parent
bc1275455c
commit
c938e652e4
7 changed files with 254 additions and 56 deletions
|
|
@ -33,19 +33,22 @@ fi
|
|||
|
||||
set -e
|
||||
|
||||
# The three examples from the README.
|
||||
# (Don't run the first one using "run 0" because it would take too much
|
||||
# time with valgrind.).
|
||||
|
||||
../dve2check -e $srcdir/beem-peterson.4.dve '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)'
|
||||
run 0 ../dve2check -E $srcdir/beem-peterson.4.dve \
|
||||
'!G(P_0.wait -> F P_0.CS)' > stdout1
|
||||
# same formula, different syntax.
|
||||
run 0 ../dve2check -E $srcdir/beem-peterson.4.dve \
|
||||
'!G("P_0 == wait" -> F "P_0 == CS")' > stdout2
|
||||
cmp stdout1 stdout2
|
||||
run 0 ../dve2check -E $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")'
|
||||
for opt in '' '-z'; do
|
||||
# The three examples from the README.
|
||||
# (Don't run the first one using "run 0" because it would take too much
|
||||
# time with valgrind.).
|
||||
|
||||
../dve2check $opt -e $srcdir/beem-peterson.4.dve \
|
||||
'!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)'
|
||||
run 0 ../dve2check $opt -E $srcdir/beem-peterson.4.dve \
|
||||
'!G(P_0.wait -> F P_0.CS)' > stdout1
|
||||
# same formula, different syntax.
|
||||
run 0 ../dve2check $opt -E $srcdir/beem-peterson.4.dve \
|
||||
'!G("P_0 == wait" -> F "P_0 == CS")' > stdout2
|
||||
cmp stdout1 stdout2
|
||||
run 0 ../dve2check $opt -E $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")'
|
||||
done
|
||||
|
||||
# Now check some error messages.
|
||||
run 1 ../dve2check foo.dve "F(P_0.CS)" 2>stderr
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue