introduce partitioned_relabel_here
Function taking an automaton and trying to relabel it by partitioning the old conditions and encode the different subsets of the partition with new variables * spot/priv/Makefile.am: Add * spot/priv/partitioned_relabel.hh , spot/priv/partitioned_relabel.cc: try_partition_me, computes the partition of a given vector of bdds * spot/twaalgos/relabel.hh , spot/twaalgos/relabel.cc: Here. Adapt also relabel() to cope with the different type of relabeling_maps * tests/python/_partitioned_relabel.ipynb , tests/python/except.py: Test and Usage * tests/Makefile.am: Add test
This commit is contained in:
Philipp Schlehuber-Caissier
parent
b02d8328ee
commit
fb63dfc309
8 changed files with 1920 additions and 44 deletions
|
|
@ -29,6 +29,8 @@ libpriv_la_SOURCES = \
|
|||
bddalloc.hh \
|
||||
freelist.cc \
|
||||
freelist.hh \
|
||||
partitioned_relabel.cc \
|
||||
partitioned_relabel.hh \
|
||||
robin_hood.hh \
|
||||
satcommon.hh\
|
||||
satcommon.cc\
|
||||
|
|
|
|||
147
spot/priv/partitioned_relabel.cc
Normal file
147
spot/priv/partitioned_relabel.cc
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2022 Laboratoire de Recherche
|
||||
// de l'Epita (LRE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <spot/priv/partitioned_relabel.hh>
|
||||
|
||||
|
||||
relabeling_map
|
||||
bdd_partition::to_relabeling_map(twa_graph& for_me) const
|
||||
{
|
||||
relabeling_map res;
|
||||
// Change to unordered_map?
|
||||
bdd_dict_ptr bdddict = for_me.get_dict();
|
||||
|
||||
bool use_inner = ig->state_storage(0).new_label != bddfalse;
|
||||
std::vector<bool> doskip
|
||||
= use_inner ? std::vector<bool>(ig->num_states(), false)
|
||||
: std::vector<bool>();
|
||||
|
||||
auto bdd2form = [&bdddict](const bdd& cond)
|
||||
{
|
||||
return bdd_to_formula(cond, bdddict);
|
||||
};
|
||||
|
||||
for (const auto& [old_letter, s] : treated)
|
||||
{
|
||||
formula new_letter_form = bdd2form(ig->state_storage(s).new_label);
|
||||
assert(res.count(new_letter_form) == 0);
|
||||
if (use_inner)
|
||||
doskip[s] = true;
|
||||
res[new_letter_form] = bdd2form(old_letter);
|
||||
}
|
||||
|
||||
if (use_inner)
|
||||
{
|
||||
// This implies that the split option was false,
|
||||
// so we can store further info
|
||||
auto& all_cond = *all_cond_ptr;
|
||||
const unsigned Norig = all_cond.size();
|
||||
|
||||
for (unsigned i = 0; i < Norig; ++i)
|
||||
{
|
||||
// Internal node -> new ?
|
||||
if (doskip[i])
|
||||
continue;
|
||||
// Leave node -> already exists
|
||||
if (ig->state_storage(i).succ == 0)
|
||||
continue;
|
||||
doskip[i] = true;
|
||||
formula new_letter_form
|
||||
= bdd2form(ig->state_storage(i).new_label);
|
||||
#ifdef NDEBUG
|
||||
res[new_letter_form] = bdd2form(all_cond[i]);
|
||||
#else
|
||||
// Check if they are the same
|
||||
formula old_form = bdd2form(all_cond[i]);
|
||||
if (res.count(new_letter_form) == 0)
|
||||
res[new_letter_form] = old_form;
|
||||
else
|
||||
assert(res[new_letter_form] == old_form);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/// \brief Tries to partition the given condition vector \a all_cond
|
||||
/// abandons at \a max_letter.
|
||||
/// \return The corresponding bdd_partition
|
||||
/// \note A pointer to all_cond is captured internally, it needs
|
||||
/// to outlive the returned bdd_partition
|
||||
bdd_partition
|
||||
try_partition_me(const std::vector<bdd>& all_cond, unsigned max_letter)
|
||||
{
|
||||
// We create vector that will be succesively filled.
|
||||
// Each entry corresponds to a "letter", of the partition
|
||||
const size_t Norig = all_cond.size();
|
||||
|
||||
bdd_partition result(all_cond);
|
||||
|
||||
auto& treated = result.treated;
|
||||
auto& ig = *result.ig;
|
||||
|
||||
for (unsigned io = 0; io < Norig; ++io)
|
||||
{
|
||||
bdd cond = all_cond[io];
|
||||
const auto Nt = treated.size();
|
||||
for (size_t in = 0; in < Nt; ++in)
|
||||
{
|
||||
if (cond == bddfalse)
|
||||
break;
|
||||
if (treated[in].first == cond)
|
||||
{
|
||||
// Found this very condition -> make transition
|
||||
ig.new_edge(io, treated[in].second);
|
||||
cond = bddfalse;
|
||||
break;
|
||||
}
|
||||
if (bdd_have_common_assignment(treated[in].first, cond))
|
||||
{
|
||||
bdd inter = treated[in].first & cond;
|
||||
// Create two new states
|
||||
unsigned ssplit = ig.new_states(2);
|
||||
// ssplit becomes the state without the intersection
|
||||
// ssplit + 1 becomes the intersection
|
||||
// Both of them are implied by the original node,
|
||||
// Only inter is implied by the current letter
|
||||
ig.new_edge(treated[in].second, ssplit);
|
||||
ig.new_edge(treated[in].second, ssplit+1);
|
||||
ig.new_edge(io, ssplit+1);
|
||||
treated.emplace_back(inter, ssplit+1);
|
||||
// Update
|
||||
cond -= inter;
|
||||
treated[in].first -= inter;
|
||||
treated[in].second = ssplit;
|
||||
if (treated.size() > max_letter)
|
||||
return bdd_partition{};
|
||||
}
|
||||
}
|
||||
if (cond != bddfalse)
|
||||
{
|
||||
unsigned sc = ig.new_state();
|
||||
treated.emplace_back(cond, sc);
|
||||
ig.new_edge(io, sc);
|
||||
}
|
||||
}
|
||||
|
||||
result.relabel_succ = true;
|
||||
return result;
|
||||
}
|
||||
81
spot/priv/partitioned_relabel.hh
Normal file
81
spot/priv/partitioned_relabel.hh
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2022 Laboratoire de Recherche
|
||||
// de l'Epita (LRE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <bddx.h>
|
||||
#include <spot/graph/graph.hh>
|
||||
#include <spot/tl/formula.hh>
|
||||
#include <spot/tl/relabel.hh>
|
||||
#include <spot/twa/bdddict.hh>
|
||||
#include <spot/twa/formula2bdd.hh>
|
||||
#include <spot/twa/twagraph.hh>
|
||||
|
||||
|
||||
using namespace spot;
|
||||
|
||||
struct bdd_partition
|
||||
{
|
||||
struct S
|
||||
{
|
||||
bdd new_label = bddfalse;
|
||||
};
|
||||
struct T
|
||||
{
|
||||
};
|
||||
using implication_graph = digraph<S, T>;
|
||||
|
||||
// A pointer to the conditions to be partitioned
|
||||
const std::vector<bdd>* all_cond_ptr;
|
||||
// Graph with the invariant that
|
||||
// children imply parents
|
||||
// Leaves from the partition
|
||||
// original conditions are "root" nodes
|
||||
std::unique_ptr<implication_graph> ig;
|
||||
// todo: technically there are at most two successors, so a graph
|
||||
// is "too" generic
|
||||
// All conditions currently part of the partition
|
||||
// unsigned corresponds to the associated node
|
||||
std::vector<std::pair<bdd, unsigned>> treated;
|
||||
std::vector<formula> new_aps;
|
||||
bool relabel_succ = false;
|
||||
|
||||
bdd_partition() = default;
|
||||
bdd_partition(const std::vector<bdd>& all_cond)
|
||||
: all_cond_ptr(&all_cond)
|
||||
, ig{std::make_unique<implication_graph>(2*all_cond.size(),
|
||||
2*all_cond.size())}
|
||||
{
|
||||
// Create the roots of all old conditions
|
||||
// Each condition is associated to the state with
|
||||
// the same index
|
||||
const unsigned Norig = all_cond.size();
|
||||
ig->new_states(Norig);
|
||||
}
|
||||
|
||||
// Facilitate conversion
|
||||
// This can only be called when letters have already
|
||||
// been computed
|
||||
relabeling_map
|
||||
to_relabeling_map(twa_graph& for_me) const;
|
||||
}; // bdd_partition
|
||||
|
||||
|
||||
bdd_partition
|
||||
try_partition_me(const std::vector<bdd>& all_cond, unsigned max_letter);
|
||||
Loading…
Add table
Add a link
Reference in a new issue