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

* src/evtgbaparse/public.hh: Work around Bison 2.3 unique guards.

Browse source 
* src/ltlvisit/reduce.hh, src/ltlvisit/reduce.hh:
Add Reduce_Containment_Checks and Reduce_Containment_Checks_Stronger
flags, and call reduce_tau03.
* src/ltlvisit/contain.hh (reduce_tau03): Make "stronger" the
default.
* src/ltlvisit/contain.cc: Style.
* src/ltltest/reduc.cc: Simplify using the reduce() interface
instead of reduce_tau03.
* src/tgbatest/ltl2tgba.cc: Likewise.  Add -fr5, -fr6, and -fr7
options.
* src/tgbatest/spotlbtt.test: Remove cases using "-c", since its
current implementation is not always correct (and apparently
reduces less than -fr7).
This commit is contained in:
Alexandre Duret-Lutz 2006-08-16 15:41:00 +00:00
parent c055212326
commit 641db2d77d
10 changed files with 94 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/ltltest/reduc.cc
View file

@ -43,9 +43,6 @@ syntax(char* prog)
int
main(int argc, char** argv)
{
bool tau03 = false;
bool stronger = false;
if (argc < 3)
syntax(argv[0]);
@ -61,11 +58,10 @@ main(int argc, char** argv)
case 2:
o = spot::ltl::Reduce_Eventuality_And_Universality;
break;
case 9:
tau03 = stronger = true;
/* fall through */
case 3:
o = spot::ltl::Reduce_All;
o = spot::ltl::Reduce_Basics
| spot::ltl::Reduce_Syntactic_Implications
| spot::ltl::Reduce_Eventuality_And_Universality;
break;
case 4:
o = spot::ltl::Reduce_Basics | spot::ltl::Reduce_Syntactic_Implications;
@ -78,11 +74,14 @@ main(int argc, char** argv)
o = (spot::ltl::Reduce_Syntactic_Implications
| spot::ltl::Reduce_Eventuality_And_Universality);
break;
case 8:
stronger = true;
/* fall through */
case 7:
tau03 = true;
o = spot::ltl::Reduce_Containment_Checks;
break;
case 8:
o = spot::ltl::Reduce_Containment_Checks_Stronger;
break;
case 9:
o = spot::ltl::Reduce_All;
break;
default:
return 2;
@ -127,13 +126,6 @@ main(int argc, char** argv)
spot::ltl::destroy(ftmp1);
spot::ltl::destroy(ftmp2);
if (tau03)
{
ftmp1 = f1;
f1 = spot::ltl::reduce_tau03(f1, stronger);
spot::ltl::destroy(ftmp1);
}
int length_f1_after = spot::ltl::length(f1);
std::string f1s_after = spot::ltl::to_string(f1);