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

DVE2: preliminary implementation of compressed states.

Browse source 
* 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:
Alexandre Duret-Lutz 2011-04-08 15:57:19 +02:00
parent bc1275455c
commit c938e652e4
7 changed files with 254 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

16
iface/dve2/dve2check.cc
View file

@ -58,7 +58,9 @@ syntax(char* prog)
<< std::endl
<< " -gp output the product state-space in dot format"
<< std::endl
<< " -T time the different phases of the execution"
<< " -T time the different phases of the execution"
<< std::endl
<< " -z compress states to handle larger models"
<< std::endl;
exit(1);
@ -76,6 +78,7 @@ main(int argc, char **argv)
bool accepting_run = false;
bool expect_counter_example = false;
char *dead = 0;
bool compress_states = false;
const char* echeck_algo = "Cou99";
@ -124,6 +127,9 @@ main(int argc, char **argv)
case 'T':
use_timer = true;
break;
case 'z':
compress_states = true;
break;
default:
error:
std::cerr << "Unknown option `" << argv[i] << "'." << std::endl;
@ -198,7 +204,7 @@ main(int argc, char **argv)
if (output != DotFormula)
{
tm.start("loading dve2");
model = spot::load_dve2(argv[1], dict, &ap, deadf, true);
model = spot::load_dve2(argv[1], dict, &ap, deadf, compress_states, true);
tm.stop("loading dve2");
if (!model)
@ -256,6 +262,7 @@ main(int argc, char **argv)
assert(ec);
do
{
int memused = spot::memusage();
tm.start("running emptiness check");
spot::emptiness_check_result* res;
try
@ -266,12 +273,17 @@ main(int argc, char **argv)
{
std::cerr << "Out of memory during emptiness check."
<< std::endl;
if (!compress_states)
std::cerr << "Try option -z for state compression." << std::endl;
exit_code = 2;
exit(exit_code);
}
tm.stop("running emptiness check");
memused = spot::memusage() - memused;
ec->print_stats(std::cout);
std::cout << memused << " pages allocated for emptiness check"
<< std::endl;
if (expect_counter_example == !res &&
(!expect_counter_example || ec->safe()))