This helps working around missing C functions like strcasecmp that do not exist everywhere (e.g. on Cygwin), and for which lib/ supplies a replacement. Unfortunately we do not have such build in our current continuous integration suite, so we cannot easily detect files where such config.h inclusion would be useful. Therefore this patch simply makes it mandatory to include config.h in *.cc files. Including this in public *.hh file is currently forbidden. * spot/gen/automata.cc, spot/gen/formulas.cc, spot/kripke/fairkripke.cc, spot/kripke/kripke.cc, spot/ltsmin/ltsmin.cc, spot/misc/game.cc, spot/parseaut/fmterror.cc, spot/parsetl/fmterror.cc, spot/parsetl/parsetl.yy, spot/priv/bddalloc.cc, spot/priv/freelist.cc, spot/priv/satcommon.cc, spot/priv/trim.cc, spot/priv/weight.cc, spot/ta/ta.cc, spot/ta/taexplicit.cc, spot/ta/taproduct.cc, spot/ta/tgtaexplicit.cc, spot/ta/tgtaproduct.cc, spot/taalgos/dot.cc, spot/taalgos/emptinessta.cc, spot/taalgos/minimize.cc, spot/taalgos/reachiter.cc, spot/taalgos/statessetbuilder.cc, spot/taalgos/stats.cc, spot/taalgos/tgba2ta.cc, spot/tl/apcollect.cc, spot/tl/contain.cc, spot/tl/declenv.cc, spot/tl/defaultenv.cc, spot/tl/dot.cc, spot/tl/exclusive.cc, spot/tl/hierarchy.cc, spot/tl/length.cc, spot/tl/ltlf.cc, spot/tl/mark.cc, spot/tl/mutation.cc, spot/tl/nenoform.cc, spot/tl/print.cc, spot/tl/randomltl.cc, spot/tl/relabel.cc, spot/tl/remove_x.cc, spot/tl/simplify.cc, spot/tl/snf.cc, spot/tl/unabbrev.cc, spot/twa/acc.cc, spot/twa/bdddict.cc, spot/twa/bddprint.cc, spot/twa/formula2bdd.cc, spot/twa/taatgba.cc, spot/twa/twa.cc, spot/twa/twagraph.cc, spot/twa/twaproduct.cc, spot/twaalgos/aiger.cc, spot/twaalgos/alternation.cc, spot/twaalgos/are_isomorphic.cc, spot/twaalgos/bfssteps.cc, spot/twaalgos/canonicalize.cc, spot/twaalgos/cleanacc.cc, spot/twaalgos/cobuchi.cc, spot/twaalgos/complement.cc, spot/twaalgos/complete.cc, spot/twaalgos/compsusp.cc, spot/twaalgos/couvreurnew.cc, spot/twaalgos/cycles.cc, spot/twaalgos/degen.cc, spot/twaalgos/determinize.cc, spot/twaalgos/dot.cc, spot/twaalgos/dtbasat.cc, spot/twaalgos/dtwasat.cc, spot/twaalgos/dualize.cc, spot/twaalgos/emptiness.cc, spot/twaalgos/gtec/ce.cc, spot/twaalgos/gtec/gtec.cc, spot/twaalgos/gtec/sccstack.cc, spot/twaalgos/gtec/status.cc, spot/twaalgos/gv04.cc, spot/twaalgos/hoa.cc, spot/twaalgos/iscolored.cc, spot/twaalgos/isdet.cc, spot/twaalgos/isunamb.cc, spot/twaalgos/isweakscc.cc, spot/twaalgos/langmap.cc, spot/twaalgos/lbtt.cc, spot/twaalgos/ltl2taa.cc, spot/twaalgos/ltl2tgba_fm.cc, spot/twaalgos/magic.cc, spot/twaalgos/mask.cc, spot/twaalgos/minimize.cc, spot/twaalgos/neverclaim.cc, spot/twaalgos/parity.cc, spot/twaalgos/postproc.cc, spot/twaalgos/powerset.cc, spot/twaalgos/product.cc, spot/twaalgos/rabin2parity.cc, spot/twaalgos/randomgraph.cc, spot/twaalgos/randomize.cc, spot/twaalgos/reachiter.cc, spot/twaalgos/relabel.cc, spot/twaalgos/remfin.cc, spot/twaalgos/remprop.cc, spot/twaalgos/sbacc.cc, spot/twaalgos/sccfilter.cc, spot/twaalgos/sccinfo.cc, spot/twaalgos/se05.cc, spot/twaalgos/sepsets.cc, spot/twaalgos/simulation.cc, spot/twaalgos/split.cc, spot/twaalgos/stats.cc, spot/twaalgos/strength.cc, spot/twaalgos/stripacc.cc, spot/twaalgos/stutter.cc, spot/twaalgos/sum.cc, spot/twaalgos/tau03.cc, spot/twaalgos/tau03opt.cc, spot/twaalgos/totgba.cc, spot/twaalgos/toweak.cc, spot/twaalgos/translate.cc, spot/twaalgos/word.cc, tests/core/acc.cc, tests/core/bitvect.cc, tests/core/checkpsl.cc, tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc, tests/core/equalsf.cc, tests/core/graph.cc, tests/core/ikwiad.cc, tests/core/intvcmp2.cc, tests/core/intvcomp.cc, tests/core/kind.cc, tests/core/kripkecat.cc, tests/core/length.cc, tests/core/ltlrel.cc, tests/core/ngraph.cc, tests/core/parity.cc, tests/core/randtgba.cc, tests/core/readltl.cc, tests/core/reduc.cc, tests/core/safra.cc, tests/core/sccif.cc, tests/core/syntimpl.cc, tests/core/taatgba.cc, tests/core/tostring.cc, tests/core/trival.cc, tests/core/twagraph.cc, tests/ltsmin/modelcheck.cc, spot/parseaut/scanaut.ll, spot/parsetl/scantl.ll: Include config.h. * spot/gen/Makefile.am, spot/graph/Makefile.am, spot/kripke/Makefile.am, spot/ltsmin/Makefile.am, spot/parseaut/Makefile.am, spot/parsetl/Makefile.am, spot/priv/Makefile.am, spot/ta/Makefile.am, spot/taalgos/Makefile.am, spot/tl/Makefile.am, spot/twa/Makefile.am, spot/twaalgos/Makefile.am, spot/twaalgos/gtec/Makefile.am, tests/Makefile.am: Add the -I lib/ flags. * tests/sanity/includes.test: Catch missing config.h in *.cc, and diagnose config.h in *.hh. * tests/sanity/style.test: Better diagnostics.
314 lines
7.9 KiB
C++
314 lines
7.9 KiB
C++
// -*- coding: utf-8 -*_
|
|
// Copyright (C) 2008-2012, 2014-2016, 2018 Laboratoire
|
|
// de Recherche et Développement de l'Epita (LRDE).
|
|
// Copyright (C) 2004, 2006, 2007 Laboratoire d'Informatique de Paris
|
|
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
|
// Université Pierre et Marie Curie.
|
|
//
|
|
// This file is part of Spot, a model checking library.
|
|
//
|
|
// Spot is free software; you can redistribute it and/or modify it
|
|
// under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
|
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
// License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#include "config.h"
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include <cassert>
|
|
#include <cstdlib>
|
|
#include <string>
|
|
#include <cstring>
|
|
#include <spot/tl/parse.hh>
|
|
#include <spot/tl/print.hh>
|
|
#include <spot/tl/simplify.hh>
|
|
#include <spot/tl/length.hh>
|
|
|
|
static void
|
|
syntax(char* prog)
|
|
{
|
|
std::cerr << prog << " option formula1 (formula2)?" << std::endl;
|
|
exit(2);
|
|
}
|
|
|
|
int
|
|
main(int argc, char** argv)
|
|
{
|
|
bool readfile = false;
|
|
bool hidereduc = false;
|
|
unsigned long sum_before = 0;
|
|
unsigned long sum_after = 0;
|
|
spot::tl_simplifier_options o(false, false, false, false, false);
|
|
|
|
if (argc < 3)
|
|
syntax(argv[0]);
|
|
|
|
if (!strncmp(argv[1], "-f", 3))
|
|
{
|
|
readfile = true;
|
|
++argv;
|
|
--argc;
|
|
}
|
|
|
|
if (!strncmp(argv[1], "-h", 3))
|
|
{
|
|
hidereduc = true;
|
|
++argv;
|
|
--argc;
|
|
}
|
|
|
|
switch (atoi(argv[1]))
|
|
{
|
|
case 0:
|
|
o.reduce_basics = true;
|
|
break;
|
|
case 1:
|
|
o.synt_impl = true;
|
|
break;
|
|
case 2:
|
|
o.event_univ = true;
|
|
break;
|
|
case 3:
|
|
o.reduce_basics = true;
|
|
o.synt_impl = true;
|
|
o.event_univ = true;
|
|
break;
|
|
case 4:
|
|
o.reduce_basics = true;
|
|
o.synt_impl = true;
|
|
break;
|
|
case 5:
|
|
o.reduce_basics = true;
|
|
o.event_univ = true;
|
|
break;
|
|
case 6:
|
|
o.synt_impl = true;
|
|
o.event_univ = true;
|
|
break;
|
|
case 7:
|
|
o.containment_checks = true;
|
|
break;
|
|
case 8:
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
break;
|
|
case 9:
|
|
o.reduce_basics = true;
|
|
o.synt_impl = true;
|
|
o.event_univ = true;
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
break;
|
|
case 10:
|
|
o.reduce_basics = true;
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
break;
|
|
case 11:
|
|
o.synt_impl = true;
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
break;
|
|
case 12:
|
|
o.reduce_basics = true;
|
|
o.synt_impl = true;
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
break;
|
|
case 13:
|
|
o.event_univ = true;
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
break;
|
|
case 14:
|
|
o.reduce_basics = true;
|
|
o.event_univ = true;
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
break;
|
|
case 15:
|
|
o.reduce_basics = true;
|
|
o.event_univ = true;
|
|
o.containment_checks = true;
|
|
o.containment_checks_stronger = true;
|
|
o.favor_event_univ = true;
|
|
break;
|
|
default:
|
|
return 2;
|
|
}
|
|
|
|
int exit_code = 0;
|
|
|
|
{
|
|
spot::tl_simplifier* simp = new spot::tl_simplifier(o);
|
|
o.reduce_size_strictly = true;
|
|
spot::tl_simplifier* simp_size = new spot::tl_simplifier(o);
|
|
|
|
spot::formula f1 = nullptr;
|
|
spot::formula f2 = nullptr;
|
|
|
|
std::ifstream* fin = nullptr;
|
|
|
|
if (readfile)
|
|
{
|
|
fin = new std::ifstream(argv[2]);
|
|
if (!*fin)
|
|
{
|
|
std::cerr << "Cannot open " << argv[2] << std::endl;
|
|
exit(2);
|
|
}
|
|
}
|
|
|
|
next_line:
|
|
|
|
if (fin)
|
|
{
|
|
std::string input;
|
|
do
|
|
{
|
|
if (!std::getline(*fin, input))
|
|
goto end;
|
|
}
|
|
while (input == "");
|
|
|
|
auto pf1 = spot::parse_infix_psl(input);
|
|
if (pf1.format_errors(std::cerr))
|
|
return 2;
|
|
f1 = pf1.f;
|
|
}
|
|
else
|
|
{
|
|
auto pf1 = spot::parse_infix_psl(argv[2]);
|
|
if (pf1.format_errors(std::cerr))
|
|
return 2;
|
|
f1 = pf1.f;
|
|
}
|
|
|
|
if (argc == 4)
|
|
{
|
|
if (readfile)
|
|
{
|
|
std::cerr << "Cannot read from file and check result." << std::endl;
|
|
exit(2);
|
|
}
|
|
|
|
auto pf2 = spot::parse_infix_psl(argv[3]);
|
|
if (pf2.format_errors(std::cerr))
|
|
return 2;
|
|
f2 = pf2.f;
|
|
}
|
|
|
|
{
|
|
spot::formula ftmp1;
|
|
|
|
ftmp1 = f1;
|
|
f1 = simp_size->negative_normal_form(f1, false);
|
|
|
|
int length_f1_before = spot::length(f1);
|
|
std::string f1s_before = spot::str_psl(f1);
|
|
std::string f1l;
|
|
|
|
spot::formula input_f = f1;
|
|
f1 = simp_size->simplify(input_f);
|
|
if (!simp_size->are_equivalent(input_f, f1))
|
|
{
|
|
std::cerr << "Incorrect reduction from `" << f1s_before
|
|
<< "' to `";
|
|
print_psl(std::cerr, f1) << "'.\n";
|
|
exit_code = 3;
|
|
}
|
|
else
|
|
{
|
|
spot::formula maybe_larger = simp->simplify(input_f);
|
|
f1l = spot::str_psl(maybe_larger);
|
|
if (!simp->are_equivalent(input_f, maybe_larger))
|
|
{
|
|
std::cerr << "Incorrect reduction (reduce_size_strictly=0) from `"
|
|
<< f1s_before << "' to `" << f1l << "'." << std::endl;
|
|
exit_code = 3;
|
|
}
|
|
}
|
|
|
|
int length_f1_after = spot::length(f1);
|
|
std::string f1s_after = spot::str_psl(f1);
|
|
|
|
std::string f2s = "";
|
|
if (f2)
|
|
{
|
|
ftmp1 = f2;
|
|
f2 = simp_size->negative_normal_form(f2, false);
|
|
f2s = spot::str_psl(f2);
|
|
}
|
|
|
|
sum_before += length_f1_before;
|
|
sum_after += length_f1_after;
|
|
|
|
// If -h is set, we want to print only formulae that have become larger.
|
|
if (!f2 && (!hidereduc || (length_f1_after > length_f1_before)))
|
|
{
|
|
std::cout << length_f1_before << ' ' << length_f1_after
|
|
<< " '" << f1s_before << "' reduce to '"
|
|
<< f1s_after << '\'';
|
|
if (f1l != "" && f1l != f1s_after)
|
|
std::cout << " or (w/o rss) to '" << f1l << '\'';
|
|
std::cout << '\n';
|
|
}
|
|
|
|
if (f2)
|
|
{
|
|
if (f1 != f2)
|
|
{
|
|
if (length_f1_after < length_f1_before)
|
|
std::cout << f1s_before << " ** " << f2s << " ** " << f1s_after
|
|
<< " KOREDUC " << std::endl;
|
|
else
|
|
std::cout << f1s_before << " ** " << f2s << " ** " << f1s_after
|
|
<< " KOIDEM " << std::endl;
|
|
exit_code = 1;
|
|
}
|
|
else
|
|
{
|
|
if (f1s_before != f1s_after)
|
|
std::cout << f1s_before << " ** " << f2s << " ** " << f1s_after
|
|
<< " OKREDUC " << std::endl;
|
|
else
|
|
std::cout << f1s_before << " ** " << f2s << " ** " << f1s_after
|
|
<< " OKIDEM" << std::endl;
|
|
exit_code = 0;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (length_f1_after > length_f1_before)
|
|
exit_code = 1;
|
|
}
|
|
|
|
if (fin)
|
|
goto next_line;
|
|
}
|
|
end:
|
|
|
|
delete simp_size;
|
|
delete simp;
|
|
|
|
if (fin)
|
|
{
|
|
float before = sum_before;
|
|
float after = sum_after;
|
|
std::cout << "gain: "
|
|
<< (1 - (after / before)) * 100 << '%' << std::endl;
|
|
delete fin;
|
|
}
|
|
}
|
|
|
|
assert(spot::fnode::instances_check());
|
|
return exit_code;
|
|
}
|