Author: karstenwolf
Date: Sun Jun 1 18:21:15 2014
New Revision: 9483
URL: http://svn.gna.org/viewcvs/service-tech?rev=9483&view=rev
Log:
Bufixing in deadlock as atomic proposition
Modified:
trunk/lola2/src/Exploration/FirelistStubbornStatePredicate.cc
trunk/lola2/src/Exploration/FirelistStubbornTscc.cc
trunk/lola2/src/Exploration/StatePredicateProperty.cc
Modified: trunk/lola2/src/Exploration/FirelistStubbornStatePredicate.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/FirelistStubbornStatePredicate.cc?rev=9483&r1=9482&r2=9483&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/FirelistStubbornStatePredicate.cc
(original)
+++ trunk/lola2/src/Exploration/FirelistStubbornStatePredicate.cc Sun Jun
1 18:21:15 2014
@@ -88,9 +88,13 @@
}
else
{
- // if no enabled transition is in the stubborn set bit an up set
+ // if no enabled transition is in the stubborn set yet an up set
// for deadlock is required, we return a deadlock preserving
// up set.
+ for (index_t i = 0; i < stackpointer; ++i)
+ {
+ onStack[dfsStack[i]] = false;
+ }
return dl->getFirelist(ns,result);
}
}
Modified: trunk/lola2/src/Exploration/FirelistStubbornTscc.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/FirelistStubbornTscc.cc?rev=9483&r1=9482&r2=9483&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/FirelistStubbornTscc.cc (original)
+++ trunk/lola2/src/Exploration/FirelistStubbornTscc.cc Sun Jun 1 18:21:15 2014
@@ -136,6 +136,10 @@
// we need to return a stubborn set with an enabled
// transition. This is exactly any deadlock preserving
// stubborn set.
+ for (index_t i = 0; i < stackpointer; ++i)
+ {
+ onStack[dfsStack[i]] = false;
+ }
return dl -> getFirelist(ns,result);
}
}
Modified: trunk/lola2/src/Exploration/StatePredicateProperty.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/StatePredicateProperty.cc?rev=9483&r1=9482&r2=9483&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/StatePredicateProperty.cc (original)
+++ trunk/lola2/src/Exploration/StatePredicateProperty.cc Sun Jun 1
18:21:15 2014
@@ -27,9 +27,10 @@
AtomicStatePredicate **atomic = new AtomicStatePredicate *[cardAtomic];
f->collectAtomic(atomic);
- index_t cardDeadlock = f->countDeadlock();
- DeadlockPredicate **changedDeadlock = new DeadlockPredicate
*[cardDeadlock];
- f->collectDeadlock(changedDeadlock);
+ cardDeadlock = f->countDeadlock();
+ changedDeadlock = new DeadlockPredicate *[cardDeadlock];
+ index_t c = f->collectDeadlock(changedDeadlock);
+ assert(c == cardDeadlock);
// initialize up sets
for (index_t i = 0; i < cardAtomic; i++)
--
You received this e-mail, because you subscribed the mailing list
"service-tech-commits" which will forward you any e-mail addressed to
[email protected]. If you want to unsubscribe or make any changes to
your subscription, please go to
https://mail.gna.org/listinfo/service-tech-commits.
