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 index 82a2d1c..722800a 100644 --- 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 enabled: net.getParallelEnabledTransitions( TreeSet ap = mapTransitionIds(enabled); TreeSet 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 enabled: net.getParallelEnabledTransitions( private TreeSet mapTransitionIds(Set transitions) { TreeSet aps = new TreeSet(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 index 90b099f..67f7653 100644 --- 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 mapTransitionIds(Set transitions) { TreeSet aps = new TreeSet(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; } }