determinize: hide private data structures
* spot/twaalgos/determinize.hh: Move class definitions... * spot/twaalgos/determinize.cc: ... here.
This commit is contained in:
Alexandre Duret-Lutz
parent
f9252aa703
commit
e0c2452534
2 changed files with 312 additions and 310 deletions
|
|
@ -22,15 +22,94 @@
|
|||
#include <stack>
|
||||
#include <utility>
|
||||
#include <unordered_map>
|
||||
#include <set>
|
||||
#include <map>
|
||||
|
||||
#include "spot/twaalgos/determinize.hh"
|
||||
#include "spot/twaalgos/degen.hh"
|
||||
#include "spot/twaalgos/sccfilter.hh"
|
||||
#include "spot/twaalgos/simulation.hh"
|
||||
#include "spot/twaalgos/complete.hh"
|
||||
|
||||
#include <spot/misc/bddlt.hh>
|
||||
#include <spot/twaalgos/sccinfo.hh>
|
||||
#include <spot/twaalgos/determinize.hh>
|
||||
#include <spot/twaalgos/degen.hh>
|
||||
#include <spot/twaalgos/sccfilter.hh>
|
||||
#include <spot/twaalgos/simulation.hh>
|
||||
#include <spot/twaalgos/complete.hh>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
namespace node_helper
|
||||
{
|
||||
using brace_t = unsigned;
|
||||
void renumber(std::vector<brace_t>& braces,
|
||||
const std::vector<unsigned>& decr_by);
|
||||
void truncate_braces(std::vector<brace_t>& braces,
|
||||
const std::vector<unsigned>& rem_succ_of,
|
||||
std::vector<size_t>& nb_braces);
|
||||
};
|
||||
|
||||
class safra_state
|
||||
{
|
||||
public:
|
||||
using state_t = unsigned;
|
||||
using color_t = unsigned;
|
||||
using bdd_id_t = unsigned;
|
||||
using nodes_t = std::map<state_t, std::vector<node_helper::brace_t>>;
|
||||
using succs_t = std::vector<std::pair<safra_state, bdd_id_t>>;
|
||||
using safra_node_t = std::pair<state_t, std::vector<node_helper::brace_t>>;
|
||||
|
||||
bool operator<(const safra_state& other) const;
|
||||
// Printh the number of states in each brace
|
||||
safra_state(state_t state_number, bool init_state = false,
|
||||
bool acceptance_scc = false);
|
||||
// Given a certain transition_label, compute all the successors of that
|
||||
// label, and return that new node.
|
||||
void
|
||||
compute_succs(const const_twa_graph_ptr& aut,
|
||||
succs_t& res,
|
||||
const scc_info& scc,
|
||||
const std::map<int, bdd>& implications,
|
||||
const std::vector<bool>& is_connected,
|
||||
std::unordered_map<bdd, unsigned, bdd_hash>& bdd2num,
|
||||
std::vector<bdd>& all_bdds,
|
||||
bool scc_opt,
|
||||
bool use_bisimulation,
|
||||
bool use_stutter) const;
|
||||
// Compute successor for transition ap
|
||||
safra_state
|
||||
compute_succ(const const_twa_graph_ptr& aut,
|
||||
const bdd& ap,
|
||||
const scc_info& scc,
|
||||
const std::map<int, bdd>& implications,
|
||||
const std::vector<bool>& is_connected,
|
||||
bool scc_opt,
|
||||
bool use_bisimulation) const;
|
||||
// scc_id has to be an accepting SCC. This function tries to find a node
|
||||
// who lives in that SCC and if it does, we return the brace_id of that SCC.
|
||||
unsigned find_scc_brace_id(unsigned scc_id, const scc_info& scc);
|
||||
// The outermost brace of each node cannot be green
|
||||
void ungreenify_last_brace();
|
||||
// When a nodes a implies a node b, remove the node a.
|
||||
void merge_redundant_states(const std::map<int, bdd>& implications,
|
||||
const scc_info& scc,
|
||||
const std::vector<bool>& is_connected);
|
||||
// Used when creating the list of successors
|
||||
// A new intermediate node is created with src's braces and with dst as id
|
||||
// A merge is done if dst already existed in *this
|
||||
void update_succ(const std::vector<node_helper::brace_t>& braces,
|
||||
state_t dst, const acc_cond::mark_t acc);
|
||||
// Return the emitted color, red or green
|
||||
color_t finalize_construction();
|
||||
// A list of nodes similar to the ones of a
|
||||
// safra tree. These are constructed in the same way as the powerset
|
||||
// algorithm.
|
||||
nodes_t nodes_;
|
||||
// A counter that indicates the nomber of states within a brace.
|
||||
// This enables us to compute the red value
|
||||
std::vector<size_t> nb_braces_;
|
||||
// A bitfield to know if a brace can emit green.
|
||||
std::vector<bool> is_green_;
|
||||
color_t color_;
|
||||
};
|
||||
|
||||
namespace
|
||||
{
|
||||
using power_set = std::map<safra_state, int>;
|
||||
|
|
@ -167,30 +246,31 @@ namespace spot
|
|||
return res;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<bool> find_scc_paths(const scc_info& scc);
|
||||
|
||||
unsigned
|
||||
safra_state::find_scc_brace_id(unsigned scc_id, const scc_info& scc)
|
||||
{
|
||||
std::vector<bool> find_scc_paths(const scc_info& scc);
|
||||
|
||||
unsigned
|
||||
safra_state::find_scc_brace_id(unsigned scc_id, const scc_info& scc)
|
||||
{
|
||||
for (auto& n: nodes_)
|
||||
{
|
||||
if (scc_id == scc.scc_of(n.first))
|
||||
return n.second.front();
|
||||
}
|
||||
return -1U;
|
||||
}
|
||||
}
|
||||
|
||||
safra_state
|
||||
safra_state::compute_succ(const const_twa_graph_ptr& aut,
|
||||
safra_state
|
||||
safra_state::compute_succ(const const_twa_graph_ptr& aut,
|
||||
const bdd& ap,
|
||||
const scc_info& scc,
|
||||
const std::map<int, bdd>& implications,
|
||||
const std::vector<bool>& is_connected,
|
||||
bool scc_opt,
|
||||
bool use_bisimulation) const
|
||||
{
|
||||
{
|
||||
safra_state ss = safra_state(nb_braces_.size());
|
||||
for (auto& node: nodes_)
|
||||
{
|
||||
|
|
@ -229,20 +309,21 @@ safra_state::compute_succ(const const_twa_graph_ptr& aut,
|
|||
ss.ungreenify_last_brace();
|
||||
ss.color_ = ss.finalize_construction();
|
||||
return ss;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
safra_state::compute_succs(const const_twa_graph_ptr& aut,
|
||||
void
|
||||
safra_state::compute_succs(const const_twa_graph_ptr& aut,
|
||||
succs_t& res,
|
||||
const scc_info& scc,
|
||||
const std::map<int, bdd>& implications,
|
||||
const std::vector<bool>& is_connected,
|
||||
std::unordered_map<bdd, unsigned, bdd_hash>& bdd2num,
|
||||
std::unordered_map<bdd, unsigned, bdd_hash>&
|
||||
bdd2num,
|
||||
std::vector<bdd>& all_bdds,
|
||||
bool scc_opt,
|
||||
bool use_bisimulation,
|
||||
bool use_stutter) const
|
||||
{
|
||||
{
|
||||
for (auto& ap: all_bdds)
|
||||
{
|
||||
safra_state ss = *this;
|
||||
|
|
@ -279,7 +360,7 @@ safra_state::compute_succs(const const_twa_graph_ptr& aut,
|
|||
unsigned bdd_idx = bdd2num[ap];
|
||||
res.emplace_back(ss, bdd_idx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
safra_state::merge_redundant_states(const std::map<int, bdd>& implications,
|
||||
|
|
|
|||
|
|
@ -19,89 +19,10 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <set>
|
||||
#include <map>
|
||||
|
||||
#include <spot/misc/bddlt.hh>
|
||||
#include <spot/twa/twagraph.hh>
|
||||
#include <spot/twaalgos/sccinfo.hh>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
namespace node_helper
|
||||
{
|
||||
using brace_t = unsigned;
|
||||
void renumber(std::vector<brace_t>& braces,
|
||||
const std::vector<unsigned>& decr_by);
|
||||
void truncate_braces(std::vector<brace_t>& braces,
|
||||
const std::vector<unsigned>& rem_succ_of,
|
||||
std::vector<size_t>& nb_braces);
|
||||
};
|
||||
|
||||
class safra_state
|
||||
{
|
||||
public:
|
||||
using state_t = unsigned;
|
||||
using color_t = unsigned;
|
||||
using bdd_id_t = unsigned;
|
||||
using nodes_t = std::map<state_t, std::vector<node_helper::brace_t>>;
|
||||
using succs_t = std::vector<std::pair<safra_state, bdd_id_t>>;
|
||||
using safra_node_t = std::pair<state_t, std::vector<node_helper::brace_t>>;
|
||||
|
||||
bool operator<(const safra_state& other) const;
|
||||
// Printh the number of states in each brace
|
||||
safra_state(state_t state_number, bool init_state = false,
|
||||
bool acceptance_scc = false);
|
||||
// Given a certain transition_label, compute all the successors of that
|
||||
// label, and return that new node.
|
||||
void
|
||||
compute_succs(const const_twa_graph_ptr& aut,
|
||||
succs_t& res,
|
||||
const scc_info& scc,
|
||||
const std::map<int, bdd>& implications,
|
||||
const std::vector<bool>& is_connected,
|
||||
std::unordered_map<bdd, unsigned, bdd_hash>& bdd2num,
|
||||
std::vector<bdd>& all_bdds,
|
||||
bool scc_opt,
|
||||
bool use_bisimulation,
|
||||
bool use_stutter) const;
|
||||
// Compute successor for transition ap
|
||||
safra_state
|
||||
compute_succ(const const_twa_graph_ptr& aut,
|
||||
const bdd& ap,
|
||||
const scc_info& scc,
|
||||
const std::map<int, bdd>& implications,
|
||||
const std::vector<bool>& is_connected,
|
||||
bool scc_opt,
|
||||
bool use_bisimulation) const;
|
||||
// scc_id has to be an accepting SCC. This function tries to find a node
|
||||
// who lives in that SCC and if it does, we return the brace_id of that SCC.
|
||||
unsigned find_scc_brace_id(unsigned scc_id, const scc_info& scc);
|
||||
// The outermost brace of each node cannot be green
|
||||
void ungreenify_last_brace();
|
||||
// When a nodes a implies a node b, remove the node a.
|
||||
void merge_redundant_states(const std::map<int, bdd>& implications,
|
||||
const scc_info& scc,
|
||||
const std::vector<bool>& is_connected);
|
||||
// Used when creating the list of successors
|
||||
// A new intermediate node is created with src's braces and with dst as id
|
||||
// A merge is done if dst already existed in *this
|
||||
void update_succ(const std::vector<node_helper::brace_t>& braces,
|
||||
state_t dst, const acc_cond::mark_t acc);
|
||||
// Return the emitted color, red or green
|
||||
color_t finalize_construction();
|
||||
// A list of nodes similar to the ones of a
|
||||
// safra tree. These are constructed in the same way as the powerset
|
||||
// algorithm.
|
||||
nodes_t nodes_;
|
||||
// A counter that indicates the nomber of states within a brace.
|
||||
// This enables us to compute the red value
|
||||
std::vector<size_t> nb_braces_;
|
||||
// A bitfield to know if a brace can emit green.
|
||||
std::vector<bool> is_green_;
|
||||
color_t color_;
|
||||
};
|
||||
|
||||
SPOT_API twa_graph_ptr
|
||||
tgba_determinisation(const const_twa_graph_ptr& aut,
|
||||
bool bisimulation = false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue