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

It works!

Browse Source
This commit is contained in:
Artur Meski
2018-04-03 20:35:12 +01:00
parent 95d8123a6b
commit 6e54380f14
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mc.cc
View File

@@ -77,7 +77,6 @@ inline BDD ModelChecker::getSucc(const BDD &states)
} }
else { else {
q *= states * *trm; q *= states * *trm;
BDD_PRINT(q);
} }
q = (q.ExistAbstract(*pv_E)).SwapVariables(*pv_succ, *pv); q = (q.ExistAbstract(*pv_E)).SwapVariables(*pv_succ, *pv);

27
symrs.cc
View File

@@ -410,6 +410,15 @@ bool SymRS::ctxEntityExists(Process proc_id, Entity entity) const
return false; return false;
} }
bool SymRS::processUsesEntity(Process proc_id, Entity entity_id) const
{
if (productEntityExists(proc_id, entity_id) || ctxEntityExists(proc_id, entity_id)) {
return true;
}
return false;
}
BDD SymRS::encEntitiesConj_raw(Process proc_id, const Entities &entities, bool succ) BDD SymRS::encEntitiesConj_raw(Process proc_id, const Entities &entities, bool succ)
{ {
BDD r = BDD_TRUE; BDD r = BDD_TRUE;
@@ -458,6 +467,9 @@ BDD SymRS::encEntityCondition(Process proc_id, Entity entity_id)
r += encCtxEntity(proc_id, entity_id); r += encCtxEntity(proc_id, entity_id);
} }
// pointless call to this function -- we should have prevented it:
assert(r != BDD_FALSE);
return r; return r;
} }
@@ -589,7 +601,9 @@ BDD SymRS::encEnabledness(Process proc_id, Entity entity_id)
BDD proc_reactants = BDD_FALSE; BDD proc_reactants = BDD_FALSE;
for (unsigned int proc_id = 0; proc_id < numberOfProc; ++proc_id) { for (unsigned int proc_id = 0; proc_id < numberOfProc; ++proc_id) {
proc_reactants += encProcEnabled(proc_id) * encEntityCondition(proc_id, reactant); if (processUsesEntity(proc_id, reactant)) {
proc_reactants += encProcEnabled(proc_id) * encEntityCondition(proc_id, reactant);
}
} // END FOR: prod_id } // END FOR: prod_id
reactants *= proc_reactants; reactants *= proc_reactants;
@@ -597,13 +611,18 @@ BDD SymRS::encEnabledness(Process proc_id, Entity entity_id)
// For inhibitors, we take all the processes first and then we iterate over the inhibitors // For inhibitors, we take all the processes first and then we iterate over the inhibitors
for (unsigned int proc_id = 0; proc_id < numberOfProc; ++proc_id) { for (unsigned int proc_id = 0; proc_id < numberOfProc; ++proc_id) {
BDD proc_inhibitors = encProcEnabled(proc_id); BDD proc_inhibitors = BDD_TRUE;
for (const auto &inhibitor : cond.inhib) { for (const auto &inhibitor : cond.inhib) {
proc_inhibitors *= !encEntityCondition(proc_id, inhibitor); if (processUsesEntity(proc_id, inhibitor)) {
proc_inhibitors *= !encEntityCondition(proc_id, inhibitor);
}
} }
inhibitors *= proc_inhibitors; if (proc_inhibitors != BDD_TRUE) { // just an optimisation
proc_inhibitors += !encProcEnabled(proc_id);
inhibitors *= proc_inhibitors;
}
} }
enab += reactants * inhibitors; enab += reactants * inhibitors;

3
symrs.hh
View File

@@ -278,6 +278,7 @@ class SymRS
bool productEntityExists(Process proc_id, Entity entity) const; bool productEntityExists(Process proc_id, Entity entity) const;
bool ctxEntityExists(Process proc_id, Entity entity) const; bool ctxEntityExists(Process proc_id, Entity entity) const;
bool processUsesEntity(Process proc_id, Entity entity_id) const;
BDD encProcEnabled(Process proc_id) const BDD encProcEnabled(Process proc_id) const
{ {
@@ -294,8 +295,6 @@ class SymRS
return encEntitiesConj_raw(proc_id, entities, true); return encEntitiesConj_raw(proc_id, entities, true);
} }
// ---- TODO below:
BDD encEntitiesDisj_raw(Process proc_id, const Entities &entities, bool succ); BDD encEntitiesDisj_raw(Process proc_id, const Entities &entities, bool succ);
BDD encEntitiesDisj(Process proc_id, const Entities &entities) BDD encEntitiesDisj(Process proc_id, const Entities &entities)
{ {