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

Fixed a bug with missing process enabledness encoding in context; fixed bit count for CA

Browse Source
This commit is contained in:
Artur Meski
2018-04-23 20:15:46 +01:00
parent 3157bb09ef
commit 142846b90c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ctx_aut.cc
View File

@@ -102,7 +102,8 @@ void CtxAut::addTransition(std::string srcStateName, std::string dstStateName)
new_transition.src_state = getStateID(srcStateName); new_transition.src_state = getStateID(srcStateName);
new_transition.ctx = tmpProcEntities; new_transition.ctx = tmpProcEntities;
tmpEntities.clear(); // tmpEntities.clear();
tmpProcEntities.clear();
new_transition.dst_state = getStateID(dstStateName); new_transition.dst_state = getStateID(dstStateName);
transitions.push_back(new_transition); transitions.push_back(new_transition);
} }

19
symrs.cc
View File

@@ -492,10 +492,7 @@ BDD SymRS::encContext(const EntitiesForProc &proc_entities)
r *= encCtxEntity(proc_id, entity); r *= encCtxEntity(proc_id, entity);
} }
// This check is not really requires. Just to be sure... r *= encProcEnabled(proc_id);
if (entities.size() > 0) {
r *= encProcEnabled(proc_id);
}
} }
return r; return r;
@@ -591,13 +588,16 @@ DecompReactions SymRS::getProductionConditions(Process proc_id)
return dr; return dr;
} }
BDD SymRS::encEnabledness(Process proc_id, Entity entity_id) BDD SymRS::encEnabledness(Process prod_proc_id, Entity entity_id)
{ {
assert(prod_conds.size() > proc_id); assert(prod_conds.size() > prod_proc_id);
BDD enab = BDD_FALSE; BDD enab = BDD_FALSE;
auto production_conditions = prod_conds[proc_id][entity_id]; auto production_conditions = prod_conds[prod_proc_id][entity_id];
VERB_LN(5, "| Produce " << rs->getEntityName(entity_id) << " in " << rs->getProcessName(prod_proc_id) << ":");
for (const auto &cond : production_conditions) { for (const auto &cond : production_conditions) {
@@ -610,6 +610,9 @@ BDD SymRS::encEnabledness(Process proc_id, Entity entity_id)
for (unsigned int proc_id = 0; proc_id < numberOfProc; ++proc_id) { for (unsigned int proc_id = 0; proc_id < numberOfProc; ++proc_id) {
if (processUsesEntity(proc_id, reactant)) { if (processUsesEntity(proc_id, reactant)) {
proc_reactants += encProcEnabled(proc_id) * encEntityCondition(proc_id, reactant); proc_reactants += encProcEnabled(proc_id) * encEntityCondition(proc_id, reactant);
VERB_LN(5, "| - if process " << rs->getProcessName(proc_id) << " is enabled and has " << rs->getEntityName(reactant));
} }
} // END FOR: prod_id } // END FOR: prod_id
@@ -748,7 +751,7 @@ size_t SymRS::getCtxAutStateEncodingSize(void)
size_t bitCountMaxVal = 1; size_t bitCountMaxVal = 1;
size_t numStates = rs->ctx_aut->statesCount(); size_t numStates = rs->ctx_aut->statesCount();
while (bitCountMaxVal <= numStates) { while (bitCountMaxVal < numStates) {
bitCount++; bitCount++;
bitCountMaxVal *= 2; bitCountMaxVal *= 2;
} }