twaalgos: Improve data storage in SAT-minimization

* spot/misc/satsolver.hh: Make solver return vector<bool> instead of
vector<int>.
* spot/misc/satsolver.cc: Update code.
* spot/priv/Makefile.am: Add satcommon.*
* spot/priv/satcommon.hh: Declare helper class and factorize some
duplicate code of dt*asat.cc
* spot/priv/satcommon.cc: Implement helper class and factorize some
duplicate code of dt*asat.cc
* spot/twaalgos/dtbasat.cc: Declare helper, implement some functions
in dict struct and update code.
* spot/twaalgos/dtwasat.cc: Declare helper, implement some functions
in dict struct and update code.
* tests/core/readsat.cc: Update tests.
* tests/core/satmin.test: Typo.
* tests/core/satmin2.test: Update an expected result.
This commit is contained in:
Alexandre GBAGUIDI AISSE 2016-10-25 16:29:29 +02:00
parent 79f4c8e0d7
commit 9acd7370b2
10 changed files with 1282 additions and 1004 deletions

View file

@ -18,12 +18,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
#include <vector>
#include <spot/misc/satsolver.hh>
int main()
{
spot::satsolver::solution sol = spot::satsolver_get_solution("-");
for (spot::satsolver::solution::const_iterator i = sol.begin();
std::vector<int> sol = spot::satsolver_get_solution("-");
for (std::vector<int>::const_iterator i = sol.begin();
i != sol.end(); ++i)
std::cout << ' ' << *i;
std::cout << '\n';

View file

@ -37,7 +37,7 @@ ltlcross=ltlcross
# (a U X!a) | XG(!b & XFc)
# XXG(Fa U Xb)
#
# Those one where removed because they were too long in the "expected" file.
# Those ones were removed because they were too long in the "expected" file.
# We can not exceed 80 characters!
#
# p U (q & X(r & F(s & XF(u & XF(v & XFw)))))

View file

@ -149,8 +149,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic
--BODY--
State: 0
[!0] 0 {0}
[0] 0 {1}
[0] 0 {0}
[!0] 0 {1}
--END--
EOF