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

ltsmin: fix test cases and naming.

Browse source 
* iface/ltsmin/kripke.test: Fix detection of divine's ltsmin option.
* iface/ltsmin/finite.test: Likewise.  Also extra the Spins test
into...
* iface/ltsmin/finite2.test: ... this new file, so that we
can test the divine and spins interfaces independently.
* iface/ltsmin/Makefile.am: Distribute finite2.test and finite.pm.
* iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh,
iface/ltsmin/modelcheck.cc: Adjust function names.
This commit is contained in:
Alexandre Duret-Lutz 2014-12-07 00:31:01 +01:00
parent dd4b821d93
commit 3e266a2a6c
8 changed files with 92 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

27
iface/ltsmin/ltsmin.hh
View file

@ -17,8 +17,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef SPOT_IFACE_PROMELA_PROMELA_HH
# define SPOT_IFACE_PROMELA_PROMELA_HH
#ifndef SPOT_IFACE_LTSMIN_LTSMIN_HH
# define SPOT_IFACE_LTSMIN_LTSMIN_HH
#include "kripke/kripke.hh"
#include "ltlvisit/apcollect.hh"
@ -28,12 +28,15 @@
namespace spot
{
// \brief Load a PROMELA model.
// \brief Load an ltsmin model, either from divine or promela.
//
// The filename given can be either a *.prom source or a *.spins
// dynamic library compiled with "spins file".
// When the *.prom source is supplied, the *.spins will be updated
// only if it is not newer.
// The filename given can be either a *.pm/*.pml/*.prom promela
// source or a *.spins dynamic library compiled with "spins file".
// If a promela source is supplied, this function will call spins to
// update the *.spins library only if it is not newer.
//
// Similarly the divine models can be specified as *.dve source or
// *.dve or *.dve2C libraries.
//
// The dead parameter is used to control the behavior of the model
// on dead states (i.e. the final states of finite sequences).
@ -56,10 +59,10 @@ namespace spot
// dead states
// \a verbose whether to output verbose messages
SPOT_API kripke_ptr
load_model(const std::string& file, const bdd_dict_ptr& dict,
const ltl::atomic_prop_set* to_observe,
const ltl::formula* dead = ltl::constant::true_instance(),
int compress = 0, bool verbose = true);
load_ltsmin(const std::string& file, const bdd_dict_ptr& dict,
const ltl::atomic_prop_set* to_observe,
const ltl::formula* dead = ltl::constant::true_instance(),
int compress = 0, bool verbose = true);
}
#endif // SPOT_IFACE_PROMELA_PROMELA_HH
#endif // SPOT_IFACE_LTSMIN_LTSMIN_HH