alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2474 commits 6 branches 0 tags 36 MiB
Commit graph

2474 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexandre Duret-Lutz
c7b3148cb4 * src/tgbaalgos/degen.cc (unicity_table): Simplify. 2014-02-12 14:08:46 +01:00
Alexandre Duret-Lutz
bd6d88db96 [buddy] Enable C++11 and add a move constructor/assignment operator. 
* configure.ac: Enable C++11 mode.
* src/bdd.h: Use noexport, and add a move constructor and
move assignment operator.  The move version of these method
do not have to increment the reference counter, saving time.
On a small test run, this change saved 24% of the calls to
bdd_addref_nc().
 2014-02-12 14:08:46 +01:00
Alexandre Duret-Lutz
b37dc0bc90 ltlast: simplify with std::make_pair() and c++11's std::tuple 
* src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh,
src/ltlast/automatop.cc, src/ltlast/automatop.hh, src/ltlast/binop.cc,
src/ltlast/binop.hh, src/ltlast/bunop.cc, src/ltlast/bunop.hh,
src/ltlast/multop.cc, src/ltlast/multop.hh, src/ltlast/unop.cc,
src/ltlast/unop.hh: Use std::tuple to replace nested std::pair,
simplify calls to std::map::erase, use auto and std::make_pair with
insert, and simplify the dump() method using a range for.
 2014-02-12 14:08:24 +01:00
Alexandre Duret-Lutz
c64503fb33 c++11: Simplify random generation code using C++11. 
* src/misc/random.cc, src/misc/random.hh (srand, drand, mrand, rrand,
barand): Simplify using <random> from C++11.
(nrand, bmrand, prand): Remove these unused functions.
* src/tgbaalgos/randomgraph.cc: Adjust the use of barand.
* configure.ac: Do not check for srand48 and drand48.
 2014-02-12 14:07:17 +01:00
Alexandre Duret-Lutz
7480470760 Remove the configure check for Boost, since we do not use it anymore. 
* README: Do not mention Boost.
* configure.ac: Do not check for Boost.
* m4/boost.m4: Delete.
 2014-02-12 14:07:17 +01:00
Alexandre Duret-Lutz
92ef3e1016 safra: get rid of boost::dynamic_bitset. 
The bitvect implementation seems a tad faster, but most importantly
this removes the last dependency on Boost.

* src/tgba/tgbasafracomplement.cc: Replace boost::dynamic_bitset by
spot::bitvect.
 2014-02-12 14:07:17 +01:00
Alexandre Duret-Lutz
9a097bb02e bitvect: add a is_subset_of method. 
* src/misc/bitvect.hh: New method.
* src/tgbatest/bitvect.cc, src/tgbatest/bitvect.test: Test it.
 2014-02-12 14:07:16 +01:00
Alexandre Duret-Lutz
90a43db5a4 c++11: Replace boost::shared_ptr by std::shared_ptr. 
* src/eltlparse/eltlparse.yy, src/ltlast/formula_tree.hh,
src/ltlast/nfa.hh, src/saba/sabastate.hh, src/tgba/state.hh: Here.
 2014-02-12 14:07:16 +01:00
Alexandre Duret-Lutz
67b9e8d882 c++11: get rid of spot::unique_ptr 
But do not replace it by std::unique_ptr, because this was not
really equivalent.

* src/misc/unique_ptr.hh: Delete.
* src/misc/Makefile.am: Adjust.
* src/tgbaalgos/simulation.cc, src/tgbatest/ltl2tgba.cc: Call
delete explicitly.
 2014-02-12 14:07:16 +01:00
Alexandre Duret-Lutz
cdd7b475b3 * lib/argp.h: Fix compilation with g++-4.6 -std=c++0x. 2014-02-12 14:07:16 +01:00
Alexandre Duret-Lutz
3a406dc3d7 c++11: improve configure. 
* configure.ac, m4/ax_check_compile_flag.m4: Update from
Vaucanson 2.  (Thank you Akim.)
 2014-02-12 14:07:16 +01:00
Alexandre Duret-Lutz
ea6a34b0b4 * src/kripke/kripkeexplicit.cc: Work around a clang warning. 2014-02-12 14:07:13 +01:00
Alexandre Duret-Lutz
79d6ef073e * HACKING: Some notes about C++11. 2014-02-12 14:06:19 +01:00
Alexandre Duret-Lutz
c88e22d0ba c++11: work around Swig 2.0 
* src/misc/common.hh: Conditionally define SPOT_DELETED to = delete.
* src/ltlvisit/simplify.hh, src/ta/taexplicit.hh, src/ta/taproduct.hh,
src/tgba/bdddict.hh, src/tgba/taatgba.hh, src/tgba/tgbabddconcrete.hh,
src/tgba/tgbaexplicit.hh, src/tgba/tgbaproduct.hh, src/tgba/tgbasgba.hh,
src/tgba/tgbatba.hh, src/tgba/tgbaunion.hh, src/tgba/wdbacomp.cc: Use
SPOT_DELETED.
* wrap/python/spot.i: Include common.hh.
* wrap/python/Makefile.am: Remove useless definition of SPOT_API
and BUDDY_API.
 2014-02-12 14:06:19 +01:00
Alexandre Duret-Lutz
9cfc9f0f3f c++11: explicitly delete copy constructors and operator=. 
* src/ltlvisit/simplify.hh, src/ta/taexplicit.hh, src/ta/taproduct.hh,
src/tgba/bdddict.hh, src/tgba/taatgba.hh, src/tgba/tgbabddconcrete.hh,
src/tgba/tgbaexplicit.hh, src/tgba/tgbaproduct.hh, src/tgba/tgbasgba.hh,
src/tgba/tgbatba.hh, src/tgba/tgbaunion.hh, src/tgba/wdbacomp.cc: Here.
 2014-02-12 14:06:19 +01:00
Alexandre Duret-Lutz
557292bd11 c++11: use for(auto...) to simplify code in src/bin/. 
* src/bin/common_finput.cc, src/bin/genltl.cc, src/bin/ltlcross.cc,
src/bin/randltl.cc: Simplify.
 2014-02-12 14:06:15 +01:00
Alexandre Duret-Lutz
34e91b7656 c++11: replace Sgi::hash_* by Sgi::unordered_*. 
* bench/scc-stats/stats.cc, bench/split-product/cutscc.cc,
iface/gspn/ssp.cc, src/bin/ltlcross.cc, src/bin/ltlfilt.cc,
src/bin/randltl.cc, src/dstarparse/nsa2tgba.cc, src/ltlast/formula.hh,
src/ltlast/nfa.hh, src/ltlvisit/contain.hh, src/ltlvisit/dotty.cc,
src/ltlvisit/mark.hh, src/ltlvisit/relabel.cc, src/ltlvisit/relabel.hh,
src/ltlvisit/simplify.cc, src/ltlvisit/snf.hh, src/misc/hash.hh,
src/misc/mspool.hh, src/priv/acccompl.hh, src/priv/accconv.hh,
src/saba/explicitstateconjunction.hh, src/saba/sabastate.hh,
src/sabaalgos/sabareachiter.hh, src/sanity/style.test,
src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/taalgos/emptinessta.cc,
src/taalgos/minimize.cc, src/taalgos/reachiter.hh, src/tgba/state.hh,
src/tgba/taatgba.hh, src/tgba/tgbabddconcretefactory.hh,
src/tgba/tgbaexplicit.hh, src/tgba/tgbakvcomplement.cc,
src/tgba/tgbasafracomplement.cc, src/tgba/tgbatba.cc,
src/tgba/tgbatba.hh, src/tgbaalgos/cutscc.cc, src/tgbaalgos/cycles.hh,
src/tgbaalgos/degen.cc, src/tgbaalgos/dtbasat.cc,
src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/emptiness.cc, src/tgbaalgos/gtec/explscc.hh,
src/tgbaalgos/gtec/nsheap.hh, src/tgbaalgos/gv04.cc,
src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/magic.cc,
src/tgbaalgos/minimize.cc, src/tgbaalgos/ndfs_result.hxx,
src/tgbaalgos/powerset.hh, src/tgbaalgos/randomgraph.cc,
src/tgbaalgos/reachiter.hh, src/tgbaalgos/replayrun.cc,
src/tgbaalgos/safety.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/se05.cc,
src/tgbaalgos/simulation.cc, src/tgbaalgos/tau03.cc,
src/tgbaalgos/tau03opt.cc: Adjust code.
* src/sanity/style.test: Remove check.
 2014-02-12 14:05:04 +01:00
Alexandre Duret-Lutz
c568b4d337 hash.hh: Remove conditional code. 
* m4/stl.m4: Delete.
* configure.ac: Do not check for unordered_map and friends.
* src/misc/hash.hh: Remove all conditional code.
 2014-02-12 14:04:57 +01:00
Alexandre Duret-Lutz
f3874e05cc * configure.ac: Turn on C++11 flags. 2014-02-12 14:04:10 +01:00
Alexandre Duret-Lutz
2c05a9fdb6 ltlast: move all accessor methods to headers to help the optimizer 
* src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh,
src/ltlast/automatop.cc, src/ltlast/automatop.hh, src/ltlast/binop.cc,
src/ltlast/binop.hh, src/ltlast/bunop.cc, src/ltlast/bunop.hh,
src/ltlast/constant.cc, src/ltlast/constant.hh, src/ltlast/multop.cc,
src/ltlast/multop.hh, src/ltlast/unop.cc, src/ltlast/unop.hh: Move all
one-line accessors methods like nth(), child(), op()... from *.cc files
to their respective *.hh files.
 2014-02-12 10:43:42 +01:00
Alexandre Duret-Lutz
9020ac8bef * doc/org/satmin.org: Reword last paragraph. 2014-02-12 10:06:53 +01:00
Alexandre Duret-Lutz
be43c1e957 * NEWS, configure.ac: Bump version to 1.2.3a. 2014-02-11 17:30:10 +01:00
Alexandre Duret-Lutz
2a7d5f5f7f Release Spot 1.2.3 
* NEWS, configure.ac, doc/org/tools.org: Update version.
 2014-02-11 17:20:58 +01:00
Alexandre Duret-Lutz
327b7e18b2 * bench/dtgbasat/README: Update glucose URL. 2014-02-11 17:17:15 +01:00
Alexandre Duret-Lutz
f567d88ff8 * NEWS: mention recent fixes. 2014-02-11 10:45:15 +01:00
Alexandre Duret-Lutz
58878cd405 Work around the clang version installed with MacOS X 10.9. 
Apparently their hash tables store the hash functions in a const
member, and this requires a user-supplied default constructor.
Reported by Étienne Renault.

* src/misc/hash.hh: Add an empty constructor to all hash functions.
 2014-02-11 10:40:19 +01:00
Alexandre Duret-Lutz
0b5f63c296 Add missing const. 
* src/kripke/kripkeexplicit.cc: Add missing const, reported by Etienne
Renault using Apple's clang version that is installed with OS X 10.9.
 2014-02-11 10:05:57 +01:00
Alexandre Lewkowicz
cb0b3d3c67 testsuite: find files when building in remote directory 
* doc/Makefile.am, src/ltltest/defs.in, src/ltltest/latex.test: Here.
 2014-02-10 16:56:20 +01:00
Alexandre Duret-Lutz
eb778c569a sat: adjust SPOT_SATSOLVER default for glucose 3.0 
* src/misc/satsolver.cc: Add the "-model" option.
* NEWS, doc/org/satmin.org, src/bin/man/spot-x.x: Mention it.
 2014-02-08 21:34:35 +01:00
Alexandre Duret-Lutz
fd4a963a26 * src/bin/common_setup.cc: Bump copyright year. 2014-02-08 20:31:49 +01:00
Alexandre Duret-Lutz
3c985a3235 sat: document the SPOT_SATLOG envvar 
* doc/org/satmin.org, src/bin/man/spot-x.x: Document it.
* NEWS: Mention it.
 2014-02-08 20:31:49 +01:00
Alexandre Duret-Lutz
20824b96b9 timer: also consider the time spent in child processes 
* src/misc/timer.hh: Fix.
* NEWS: Mention the bug.
 2014-02-08 20:31:49 +01:00
Alexandre Duret-Lutz
55ee18b96a sat-minimize: more statistics. 
* src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbasat.cc: Record
statistics about intermediate automata if SPOT_SATLOG is set to some
filename, and display intermediate automata if SPOT_SATSHOW is set.
* bench/dtgbasat/stat.sh, bench/dtgbasat/stats.sh,
bench/dtgbasat/tabl.pl, bench/dtgbasat/tabl1.pl,
bench/dtgbasat/tabl2.pl, bench/dtgbasat/tabl3.pl,
bench/dtgbasat/tabl4.pl: Gather these extra statistics.
 2014-02-08 20:31:49 +01:00
Alexandre Duret-Lutz
1319ec0bad sat-minimize: limit number of iterations 
* src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbasat.cc: Compute the
actual number of reachable states in the produced automaton to prepare
the next iteration.
 2014-02-08 20:31:49 +01:00
Alexandre Duret-Lutz
e1be8e6e42 * bench/dtgbasat/README: Typo. 2014-02-08 20:31:49 +01:00
Alexandre Duret-Lutz
9c0021fac8 * src/tgbatest/satmin2.test, src/tgbatest/Makefile.am: New test. 2014-02-08 20:31:49 +01:00
Alexandre Duret-Lutz
7a26a4f1ec Revert "* src/tgbaalgos/dtbasat.cc: Better encoding for weak SCCs." 
This was simply wrong.

* src/tgbaalgos/dtbasat.cc: reverts commit
fc5a00d24d5964d6f6a48d362ecbdec357eaf154.
 2014-02-08 20:31:26 +01:00
Alexandre Duret-Lutz
b4d0b9ee42 sat: more debug. 
* src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbasat.cc: More debuging
code.
 2014-02-07 12:07:16 +01:00
Alexandre Duret-Lutz
9c98975c19 sat: factor the creation of temporary files 
* src/misc/satsolver.hh, src/misc/satsolver.cc: Present
the SAT solver as an object with a stream interface, to
prepare for a better implementation.
* src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbasat.cc:
Adjust to the new interface, removing all the handling
of temporary files.
* src/tgbatest/readsat.cc: Adjust.
 2014-02-07 12:07:16 +01:00
Alexandre Duret-Lutz
1853bdd53b sat: fix some non-determinism of the encoding 
* src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbasat.cc: Rewrite the
loops that number the states of the reference automaton so that
they declare CNF variable numbers in the same order as the states
of the automaton.
 2014-02-07 12:07:16 +01:00
Alexandre Duret-Lutz
e5874ee4c7 Call glucose with -verb=0. 
* src/misc/satsolver.cc: Call glucose with -verb=0.
* src/bin/man/spot-x.x: Document it.
 2014-02-07 12:07:16 +01:00
Alexandre Duret-Lutz
977a6dfaee * src/tgbaalgos/dtbasat.cc: Better encoding for weak SCCs. 2014-02-07 12:07:16 +01:00
Alexandre Duret-Lutz
4334abdeed org: Fix UP links and center them on the page. 
* doc/org/init.el.in: Center links.
* doc/org/csv.org, doc/org/dstar2tgba.org, doc/org/genltl.org,
doc/org/ioltl.org, doc/org/ltl2tgba.org, doc/org/ltl2tgta.org,
doc/org/ltlcross.org, doc/org/ltlfilt.org, doc/org/randltl.org,
doc/org/satmin.org: Fix links.  Reported by Akim Demaille.
 2014-02-06 22:28:37 +01:00
Alexandre Duret-Lutz
c2195600b8 Fix spurious failre with Pandas 0.13. 
* src/tgbatest/ltlcross4.test: Work around Pandas 0.13.
* NEWS: Mention it.
 2014-02-06 01:33:17 +01:00
Alexandre Duret-Lutz
38388748b0 * NEWS: Mention recent fixes. 2014-02-06 00:45:18 +01:00
Alexandre Duret-Lutz
50bdc24514 randltl: gracefully handle the absence of unary or binary operators. 
* src/ltlvisit/randomltl.cc: Fix generation of formulas when unary or
binary operators are missing.
* src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh
(destroy_atomic_prop_set): New function.
* src/bin/randltl.cc: Use it, and also honnor --boolean-priorities
when generating SEREs.
* src/ltltest/rand.test: New file.
* src/ltltest/Makefile.am: Add it.
 2014-02-06 00:15:27 +01:00
Alexandre Duret-Lutz
4911e7dc1f Fix warning of Clang-3.5 against Doxygen comments. 
* src/dstarparse/public.hh: Avoid LaTeX in comments to please clang-3.5.
* src/tgbaalgos/isdet.hh: Typo in Doxygen comment.
 2014-02-05 15:07:34 +01:00
Alexandre Duret-Lutz
17dd281b33 * doc/org/ltlfilt.org: Typo, reported by Fabrice Kordon. 2014-02-04 07:58:52 +01:00
Alexandre Duret-Lutz
494dbe2041 length: slight simplification 
* src/ltlvisit/length.cc (length_boolone_visitor): Simplify.
* NEWS: Mention Alexandre's fix.
 2014-02-03 09:49:30 +01:00
Alexandre Lewkowicz
02334867da length_boolone: fix inconsistency 
* src/ltlvisit/length.cc: Consider length of all Boolean
expressions combined in a multop as one.
* src/ltltest/length.test: Test it.
 2014-02-03 09:40:25 +01:00