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

adjust for BuDDy change

Browse source 
* spot/twaalgos/mealy_machine.cc, python/buddy.i: Rename
bdd_has_common_assignement to bdd_have_common_assignment.
This commit is contained in:
Alexandre Duret-Lutz 2021-07-30 11:18:57 +02:00
parent dfd168b048
commit a6aa799a17
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/buddy.i
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2010, 2011, 2012, 2014, 2016 Laboratoire de Recherche et // Copyright (C) 2010, 2011, 2012, 2014, 2016, 2021 Laboratoire de
// Développement de l'EPITA. // Recherche et Développement de l'EPITA.
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre // département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie. // et Marie Curie.
@ -188,7 +188,7 @@ double bdd_satcountlnset(const bdd &r, const bdd &varset);
int bdd_nodecount(const bdd &r); int bdd_nodecount(const bdd &r);
int* bdd_varprofile(const bdd &r); int* bdd_varprofile(const bdd &r);
double bdd_pathcount(const bdd &r); double bdd_pathcount(const bdd &r);
int bdd_has_common_assignement(const bdd &l, const bdd &r); int bdd_have_common_assignment(const bdd &l, const bdd &r);
void bdd_fprinttable(FILE *file, const bdd &r); void bdd_fprinttable(FILE *file, const bdd &r);
void bdd_printtable(const bdd &r); void bdd_printtable(const bdd &r);
void bdd_fprintset(FILE *file, const bdd &r); void bdd_fprintset(FILE *file, const bdd &r);

12
spot/twaalgos/mealy_machine.cc
View file

@ -975,7 +975,7 @@ namespace
if (p1.second > p2.second) if (p1.second > p2.second)
continue; continue;
inc_player.set(p1.second, p2.second, inc_player.set(p1.second, p2.second,
!bdd_has_common_assignement( !bdd_have_common_assignment(
bdd_from_int((int) p1.first), bdd_from_int((int) p1.first),
bdd_from_int((int) p2.first))); bdd_from_int((int) p2.first)));
assert(inc_player.get(p1.second, p2.second) assert(inc_player.get(p1.second, p2.second)
@ -1005,7 +1005,7 @@ namespace
if (!is_p_incomp(e1.dst - n_env, e2.dst - n_env)) if (!is_p_incomp(e1.dst - n_env, e2.dst - n_env))
continue; //Compatible -> no prob continue; //Compatible -> no prob
// Reachable under same letter? // Reachable under same letter?
if (bdd_has_common_assignement(e1.cond, e2.cond)) if (bdd_have_common_assignment(e1.cond, e2.cond))
{ {
trace << s1 << " and " << s2 << " directly incomp " trace << s1 << " and " << s2 << " directly incomp "
"due to successors " << e1.dst << " and " << e2.dst "due to successors " << e1.dst << " and " << e2.dst
@ -1039,7 +1039,7 @@ namespace
// Have already been treated // Have already been treated
continue; continue;
// Now we need to actually check it // Now we need to actually check it
if (bdd_has_common_assignement(ei.cond, ej.cond)) if (bdd_have_common_assignment(ei.cond, ej.cond))
{ {
trace << ei.dst << " and " << ej.dst << " tagged incomp" trace << ei.dst << " and " << ej.dst << " tagged incomp"
" due to " << i << " and " << j << '\n'; " due to " << i << " and " << j << '\n';
@ -3088,7 +3088,7 @@ namespace
false); false);
if (inserted) if (inserted)
it->second = it->second =
bdd_has_common_assignement(c_list1[c1_idx], bdd_have_common_assignment(c_list1[c1_idx],
c_list2[c2_idx]); c_list2[c2_idx]);
if (!it->second) if (!it->second)
incomp_cubes_list.emplace_back((int) c1_idx, incomp_cubes_list.emplace_back((int) c1_idx,
@ -3673,7 +3673,7 @@ namespace spot
{ {
// check if el_env.cond intersects with the unspecified of // check if el_env.cond intersects with the unspecified of
// sr. If so the sequence is not applicable -> false // sr. If so the sequence is not applicable -> false
if (bdd_has_common_assignement(ucr[sr], el_env.cond)) if (bdd_have_common_assignment(ucr[sr], el_env.cond))
{ {
if (verbose) if (verbose)
std::cerr << "State " << sl << " of left is not completely" std::cerr << "State " << sl << " of left is not completely"
@ -3688,7 +3688,7 @@ namespace spot
{ {
// if they can be taken at the same time, the output // if they can be taken at the same time, the output
// of r must implies the one of left // of r must implies the one of left
if (bdd_has_common_assignement(el_env.cond, er_env.cond)) if (bdd_have_common_assignment(el_env.cond, er_env.cond))
{ {
const auto& er_p = get_p_edge_r(er_env); const auto& er_p = get_p_edge_r(er_env);
if (!bdd_implies(er_p.cond, el_p.cond)) if (!bdd_implies(er_p.cond, el_p.cond))