change order of dead place vs dead transition test

lip6 · Mar 29, 2024 · bc01c84 · bc01c84
1 parent 6f7c978
commit bc01c84
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/...move.gal.application.pnmcc/src/fr/lip6/move/gal/application/solver/UpperBoundsSolver.java b/...move.gal.application.pnmcc/src/fr/lip6/move/gal/application/solver/UpperBoundsSolver.java
@@ -281,26 +281,26 @@ public static List<Integer> applyReductions(MccTranslator reader, DoneProperties
 
 				sr.setProtected(support);
 
-				boolean foundDeadTrans = false;
-				if (iterations >= 2 || iter == 0) {
-					List<Integer> deadTransitions = findDeadTransitions(reader);
+				boolean foundDead = false;
+				if (iterations >= 1 && !foundDead) {
+					List<Integer> deadPlaces = findDeadPlaces(reader);
 
-					if (!deadTransitions.isEmpty()) {
-						sr.dropTransitions(deadTransitions, true, "Dead transitions detected with 'AG(!fireable(t))'");						
+					if (!deadPlaces.isEmpty()) {
+						sr.dropSurroundingTransitions(deadPlaces, "Dead places");
 						iter++;
-						foundDeadTrans = true;
+						foundDead=true;
 					}
 				}
-
-				if (iterations >= 1 && !foundDeadTrans) {
-					List<Integer> deadPlaces = findDeadPlaces(reader);
+				if (iterations >= 1 && !foundDead) {
+					List<Integer> deadTransitions = findDeadTransitions(reader);
 
-					if (!deadPlaces.isEmpty()) {
-						sr.dropSurroundingTransitions(deadPlaces, "Dead places");
+					if (!deadTransitions.isEmpty()) {
+						sr.dropTransitions(deadTransitions, true, "Dead transitions detected with 'AG(!fireable(t))'");						
 						iter++;
 					}
 				}
 
+
 				// a single place, that is one bounded : kill it's consumers
 				if (support.cardinality()==1 && maxStruct.get(0)==1) {
 					int pid = support.nextSetBit(0);