Tau merger off

rug-ds-lab · Nov 7, 2018 · 9bb2acf · 9bb2acf
1 parent b0acf61
commit 9bb2acf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/nl/rug/ds/bpm/verification/convert/ConverterAction.java b/src/main/java/nl/rug/ds/bpm/verification/convert/ConverterAction.java
@@ -50,7 +50,8 @@ else for (Set<? extends TransitionI> enabled: net.getParallelEnabledTransitions(
 			TreeSet<String> ap = mapTransitionIds(enabled);
 			TreeSet<String> previousAp = new TreeSet<>(new StringComparator());
 			previousAp.addAll(previous.getAtomicPropositions());
-			previousAp.remove(idMap.addID((fired.isTau() ? "tau" : (fired.getName().isEmpty() ? fired.getId() : fired.getName()))));
+			//previousAp.remove(idMap.addID((fired.isTau() ? "tau" : (fired.getName().isEmpty() ? fired.getId() : fired.getName()))));
+			previousAp.remove(idMap.addID((fired.getName().isEmpty() ? fired.getId() : fired.getName())));
 
 			if(ap.containsAll(previousAp)) {
 				State found = new State(marking.toString(), ap);
@@ -85,8 +86,10 @@ else for (Set<? extends TransitionI> enabled: net.getParallelEnabledTransitions(
 	private TreeSet<String> mapTransitionIds(Set<? extends TransitionI> transitions) {
 		TreeSet<String> aps = new TreeSet<String>(new StringComparator());
 
-		for (TransitionI transition: transitions)
-			aps.add(idMap.addID((transition.isTau() ? "tau" : (transition.getName().isEmpty() ? transition.getId() : transition.getName()))));
+		for (TransitionI transition: transitions) {
+			//aps.add(idMap.addID((transition.isTau() ? "tau" : (transition.getName().isEmpty() ? transition.getId() : transition.getName()))));
+			aps.add(idMap.addID((transition.getName().isEmpty() ? transition.getId() : transition.getName())));
+		}
 
 		return aps;
 	}

diff --git a/src/main/java/nl/rug/ds/bpm/verification/convert/KripkeConverter.java b/src/main/java/nl/rug/ds/bpm/verification/convert/KripkeConverter.java
@@ -72,11 +72,13 @@ public IDMap getIdMap() {
 
 	private TreeSet<String> mapTransitionIds(Set<? extends TransitionI> transitions) {
         TreeSet<String> aps = new TreeSet<String>(new StringComparator());
-
-        for (TransitionI transition: transitions)
-	        aps.add(idMap.addID((transition.isTau() ? "tau" : (transition.getName().isEmpty() ? transition.getId() : transition.getName()))));
-
-        return aps;
+
+		for (TransitionI transition: transitions) {
+			//aps.add(idMap.addID((transition.isTau() ? "tau" : (transition.getName().isEmpty() ? transition.getId() : transition.getName()))));
+			aps.add(idMap.addID((transition.getName().isEmpty() ? transition.getId() : transition.getName())));
+		}
+
+		return aps;
     }
 
 }