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

Partitioned trnasition relation with reordering

Browse Source
This commit is contained in:
Artur Meski
2018-07-22 18:25:19 +01:00
parent 482828a04e
commit 18e840ce17
4 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
symrs.cc
View File

@@ -660,11 +660,7 @@ BDD SymRS::encEnabledness(Process prod_proc_id, Entity entity_id)
} // END FOR: cond
if (opts->reorder_trans) {
VERB_L2("Reordering START");
Cudd_ReduceHeap(cuddMgr->getManager(), CUDD_REORDER_SIFT, 10000);
VERB_L2("Reordering DONE");
}
reorder();
return enab;
}
@@ -762,22 +758,51 @@ void SymRS::encodeTransitions(void)
if (opts->part_tr_rel) {
VERB("Using partitioned transition relation encoding");
FERROR("Partitioned transition relation is currently not supported");
if (usingContextAutomaton()) {
partTrans = new BDDvec(numberOfProc+1);
}
else {
partTrans = new BDDvec(numberOfProc);
}
}
else {
VERB("Using monolithic transition relation encoding");
monoTrans = new BDD(BDD_TRUE);
}
VERB_LN(3, "Entity production encoding for all the processes and their products");
for (const auto &proc_products : usedProducts) {
auto proc_id = proc_products.first;
auto products = proc_products.second;
if (opts->part_tr_rel)
{
for (const auto &prod : products) {
*monoTrans *= encEntityProduction(proc_id, prod);
for (const auto &proc_products : usedProducts) {
auto proc_id = proc_products.first;
auto products = proc_products.second;
(*partTrans)[proc_id] = BDD_TRUE;
for (const auto &prod : products) {
(*partTrans)[proc_id] *= encEntityProduction(proc_id, prod);
}
}
}
else {
for (const auto &proc_products : usedProducts) {
auto proc_id = proc_products.first;
auto products = proc_products.second;
for (const auto &prod : products) {
*monoTrans *= encEntityProduction(proc_id, prod);
}
}
}
VERB("Reactions ready");
@@ -785,8 +810,9 @@ void SymRS::encodeTransitions(void)
if (usingContextAutomaton()) {
VERB("Augmenting transition relation encoding with the transition relation for context automaton");
if (opts->part_tr_rel) {
FERROR("Partitioned transition relation is currently not supported");
if (opts->part_tr_rel) {
auto last_index = numberOfProc;
(*partTrans)[last_index] = *tr_ca;
}
else {
assert(tr_ca != nullptr);
@@ -915,4 +941,14 @@ void SymRS::encodeCtxAutTrans(void)
}
}
void SymRS::reorder(void)
{
if (opts->reorder_trans) {
VERB_L2("Reordering START");
Cudd_ReduceHeap(cuddMgr->getManager(), CUDD_REORDER_SIFT, 10000);
VERB_L2("Reordering DONE");
}
}
/** EOF **/