artur/reactics
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting, initial state encoding

Browse Source
This commit is contained in:
Artur Meski
2018-03-26 22:29:11 +01:00
parent 03cbf26afa
commit 1f01dce3cc
4 changed files with 77 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mc.cc
View File

@@ -7,7 +7,6 @@ ModelChecker::ModelChecker(SymRS *srs, Options *opts)
cuddMgr = srs->getCuddMgr(); cuddMgr = srs->getCuddMgr();
if (!srs->usingContextAutomaton())
initStates = srs->getEncInitStates(); initStates = srs->getEncInitStates();
totalStateVars = srs->getTotalStateVars(); totalStateVars = srs->getTotalStateVars();
@@ -35,7 +34,7 @@ ModelChecker::ModelChecker(SymRS *srs, Options *opts)
if (srs->usingContextAutomaton()) if (srs->usingContextAutomaton())
{ {
ca_init_state = srs->getEncCtxAutInitState(); // ca_init_state = srs->getEncCtxAutInitState();
pv_ca = srs->getEncCtxAutPV(); pv_ca = srs->getEncCtxAutPV();
pv_ca_succ = srs->getEncCtxAutPVsucc(); pv_ca_succ = srs->getEncCtxAutPVsucc();
ca_tr = srs->getEncCtxAutTrans(); ca_tr = srs->getEncCtxAutTrans();

4
mc.hh
View File

@@ -31,10 +31,10 @@ class ModelChecker
BDD *trm; BDD *trm;
// Context Automaton // Context Automaton
BDD *ca_init_state;
vector<BDD> *pv_ca; vector<BDD> *pv_ca;
vector<BDD> *pv_ca_succ; vector<BDD> *pv_ca_succ;
BDD *ca_tr; // BDD *ca_tr;
// BDD *ca_init_state;
unsigned int trp_size; unsigned int trp_size;
unsigned int totalStateVars; unsigned int totalStateVars;

35
symrs.cc
View File

@@ -337,8 +337,33 @@ BDD SymRS::encNoContext(void)
void SymRS::encodeInitStates(void) void SymRS::encodeInitStates(void)
{ {
VERB("Encoding initial states"); if (usingContextAutomaton())
{
VERB("Encoding initial states (using context automaton)");
encodeInitStatesForCtxAut();
}
else
{
VERB("Encoding initial states (for the action entities method -- no CA)");
encodeInitStatesNoCtxAut();
}
VERB("Initial states encoded");
}
void SymRS::encodeInitStatesForCtxAut(void)
{
initStates = new BDD(BDD_TRUE);
for (unsigned int i = 0; i < totalStateVars; ++i)
{
*initStates *= !(*pv)[i];
}
*initStates *= getEncCtxAutInitState();
}
void SymRS::encodeInitStatesNoCtxAut(void)
{
#ifndef NDEBUG #ifndef NDEBUG
if (opts->part_tr_rel) if (opts->part_tr_rel)
assert(partTrans != nullptr); assert(partTrans != nullptr);
@@ -370,8 +395,6 @@ void SymRS::encodeInitStates(void)
*initStates += q; *initStates += q;
} }
VERB("Initial states encoded");
} }
void SymRS::mapStateToAct(void) void SymRS::mapStateToAct(void)
@@ -487,15 +510,13 @@ BDD SymRS::encCtxAutState_raw(State state_id, bool succ) const
return r; return r;
} }
BDD *SymRS::getEncCtxAutInitState(void) BDD SymRS::getEncCtxAutInitState(void)
{ {
VERB_LN(2, "Encoding context automaton's initial state"); VERB_LN(2, "Encoding context automaton's initial state");
State state = rs->ctx_aut->getInitState(); State state = rs->ctx_aut->getInitState();
BDD *r = new BDD(encCtxAutState(state)); return encCtxAutState(state);
return r;
} }
BDD *SymRS::getEncCtxAutTrans(void) BDD *SymRS::getEncCtxAutTrans(void)

4
symrs.hh
View File

@@ -113,6 +113,8 @@ class SymRS
void encodeTransitions(void); void encodeTransitions(void);
void encodeTransitions_old(void); void encodeTransitions_old(void);
void encodeInitStates(void); void encodeInitStates(void);
void encodeInitStatesForCtxAut(void);
void encodeInitStatesNoCtxAut(void);
void mapStateToAct(void); void mapStateToAct(void);
void encode(void); void encode(void);
@@ -175,7 +177,7 @@ public:
* *
* @return Returns the encoded state(s) * @return Returns the encoded state(s)
*/ */
BDD *getEncCtxAutInitState(void); BDD getEncCtxAutInitState(void);
/** /**
* @brief Getter for context automaton's state variables (predecessor/non-primed) * @brief Getter for context automaton's state variables (predecessor/non-primed)