Merge lp:~verifypn-maintainers/verifypn/verifypnRuleBfix into lp:~verifypn-maintainers/verifypn/trunk

[Jiri Srba]

Fixed a condition in Rule B that now checks that the output places
of t' are not part in the query.

Fixed a condition in Rule B that now checks that the output places
of t' are not part in the query.

[Jiri Srba (srba)]

review: Approve

=== modified file 'PetriEngine/Reducer.cpp'
--- PetriEngine/Reducer.cpp	2014-03-16 12:34:08 +0000
+++ PetriEngine/Reducer.cpp	2014-03-18 18:20:13 +0000
@@ -215,9 +215,9 @@
 			{
 				continue;
 			}
-			// Check if the output places of tPost do not have any inhibitor arcs connected
+			// Check if the output places of tPost do not have any inhibitor arcs connected and are not used in the query
 			for (size_t _p = 0; _p < net->numberOfPlaces(); _p++) {
-				if (net->outArc(tPost, _p) > 0 && placeInInhib[_p] > 0) {
+				if (net->outArc(tPost, _p) > 0 && (placeInInhib[_p] > 0 || placeInQuery[_p]>0)) {
 					ok = false;
 					break;
 				}