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

* src/ltlvisit/clone.cc (clone): New const version.

Browse source 
* src/ltlvisit/clone.hh (clone): Likewise.
* src/ltlvisit/destroy.cc (destroy): New const version.
* src/ltlvisit/destroy.hh (destroy): Likewise.
* src/tgba/tgbabddconcretefactory.cc
(tgba_bdd_concrete_factory::create_state,
tgba_bdd_concrete_factory::create_atomic_prop,
tgba_bdd_concrete_factory::promise): Clone new formulae.
* src/tgba/tgbabdddict.cc (tgba_bdd_dict::tgba_bdd_dict,
tgba_bdd_dict::~tgba_bdd_dict, tgba_bdd_dict::operator=): New methods
that clone and destroy formulae.
* src/tgbatest/ltl2tgba.test, src/tgbatest/ltl2tgba.cc: New files.
* src/tgbatest/Makefile.am (check_PROGRAMS): Add ltl2tgba.
(ltl2tgba_SOURCES): New variable.
(TESTS): Add ltl2tgba.test.
This commit is contained in:
Alexandre Duret-Lutz 2003-06-06 12:45:11 +00:00
parent 578fa26cf3
commit 3991a51a17
12 changed files with 170 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/tgba/tgbabddconcretefactory.cc
View file

@ -1,6 +1,7 @@
#include "ltlvisit/clone.hh"
#include "tgbabddconcretefactory.hh"
namespace spot
namespace spot
{
tgba_bdd_concrete_factory::~tgba_bdd_concrete_factory()
{
@ -14,8 +15,9 @@ namespace spot
if (sii != dict_.now_map.end())
return sii->second;
int num = create_pair();
f = clone(f);
int num = create_pair();
dict_.now_map[f] = num;
dict_.now_formula_map[num] = f;
@ -37,6 +39,8 @@ namespace spot
if (sii != dict_.var_map.end())
return sii->second;
f = clone(f);
int num = create_node();
dict_.var_map[f] = num;
dict_.var_formula_map[num] = f;
@ -55,6 +59,8 @@ namespace spot
if (sii != dict_.prom_map.end())
return sii->second;
f = clone(f);
int num = create_node();
dict_.prom_map[f] = num;
dict_.prom_formula_map[num] = f;

45
src/tgba/tgbabdddict.cc
View file

@ -1,5 +1,7 @@
#include "tgbabdddict.hh"
#include "ltlvisit/tostring.hh"
#include "ltlvisit/clone.hh"
#include "ltlvisit/destroy.hh"
namespace spot
{
@ -55,4 +57,47 @@ namespace spot
return true;
}
tgba_bdd_dict::tgba_bdd_dict()
{
}
tgba_bdd_dict::tgba_bdd_dict(const tgba_bdd_dict& other)
: now_map(other.now_map),
now_formula_map(other.now_formula_map),
var_map(other.var_map),
var_formula_map(other.var_formula_map),
prom_map(other.prom_map),
prom_formula_map(other.prom_formula_map)
{
fv_map::iterator i;
for (i = now_map.begin(); i != now_map.end(); ++i)
ltl::clone(i->first);
for (i = var_map.begin(); i != var_map.end(); ++i)
ltl::clone(i->first);
for (i = prom_map.begin(); i != prom_map.end(); ++i)
ltl::clone(i->first);
}
tgba_bdd_dict&
tgba_bdd_dict::operator=(const tgba_bdd_dict& other)
{
if (this != &other)
{
this->~tgba_bdd_dict();
new (this) tgba_bdd_dict(other);
}
return *this;
}
tgba_bdd_dict::~tgba_bdd_dict()
{
fv_map::iterator i;
for (i = now_map.begin(); i != now_map.end(); ++i)
ltl::destroy(i->first);
for (i = var_map.begin(); i != var_map.end(); ++i)
ltl::destroy(i->first);
for (i = prom_map.begin(); i != prom_map.end(); ++i)
ltl::destroy(i->first);
}
}

5
src/tgba/tgbabdddict.hh
View file

@ -29,6 +29,11 @@ namespace spot
/// Whether this dictionary contains \a other.
bool contains(const tgba_bdd_dict& other) const;
tgba_bdd_dict();
tgba_bdd_dict(const tgba_bdd_dict& other);
tgba_bdd_dict& operator=(const tgba_bdd_dict& other);
~tgba_bdd_dict();
};
}