Another fix for the counter for unique transitions.

diff --git a/src/main/gov/nasa/jpf/listener/DPORStateReducerWithSummary.java b/src/main/gov/nasa/jpf/listener/DPORStateReducerWithSummary.java
index 08ae9a64c380d14c2e192bdf30a79638eab257bd..64025773718083adcdc6917b3469a6c134cb7a70 100755 (executable)
--- a/src/main/gov/nasa/jpf/listener/DPORStateReducerWithSummary.java
+++ b/src/main/gov/nasa/jpf/listener/DPORStateReducerWithSummary.java
@@ -85,7 +85,7 @@ public class DPORStateReducerWithSummary extends ListenerAdapter {
 
   // Statistics
   private int numOfTransitions;
-  private HashMap<Integer, HashSet<Integer>> stateToUniqueEventMap;
+  private HashMap<Integer, HashSet<Integer>> stateToUniqueTransMap;
 
   public DPORStateReducerWithSummary(Config config, JPF jpf) {
     verboseMode = config.getBoolean("printout_state_transition", false);
@@ -111,7 +111,7 @@ public class DPORStateReducerWithSummary extends ListenerAdapter {
     relevantFields = new HashSet<>();
     restorableStateMap = new HashMap<>();
     stateToPredInfo = new HashMap<>();
-    stateToUniqueEventMap = new HashMap<>();
+    stateToUniqueTransMap = new HashMap<>();
     initializeStatesVariables();
   }
 
@@ -267,7 +267,7 @@ public class DPORStateReducerWithSummary extends ListenerAdapter {
         } else {
           // We only count IntChoiceFromSet CGs
           numOfTransitions++;
-          countUniqueStateId(vm.getStateId(), icsCG.getNextChoice());
+          countUniqueTransitions(vm.getStateId(), icsCG.getNextChoice());
         }
         // Map state to event
         mapStateToEvent(icsCG.getNextChoice());
@@ -810,14 +810,14 @@ public class DPORStateReducerWithSummary extends ListenerAdapter {
 
   // --- Functions related to statistics counting
   // Count unique state IDs
-  private void countUniqueStateId(int stateId, int nextChoiceValue) {
+  private void countUniqueTransitions(int stateId, int nextChoiceValue) {
     HashSet<Integer> events;
     // Get the set of events
-    if (!stateToUniqueEventMap.containsKey(stateId)) {
+    if (!stateToUniqueTransMap.containsKey(stateId)) {
       events = new HashSet<>();
-      stateToUniqueEventMap.put(stateId, events);
+      stateToUniqueTransMap.put(stateId, events);
     } else {
-      events = stateToUniqueEventMap.get(stateId);
+      events = stateToUniqueTransMap.get(stateId);
     }
     // Insert the event
     if (!events.contains(nextChoiceValue)) {
@@ -829,7 +829,7 @@ public class DPORStateReducerWithSummary extends ListenerAdapter {
   private int summarizeUniqueTransitions() {
     // Just count the set size of each of entry map and sum them up
     int numOfUniqueTransitions = 0;
-    for (Map.Entry<Integer,HashSet<Integer>> entry : stateToUniqueEventMap.entrySet()) {
+    for (Map.Entry<Integer,HashSet<Integer>> entry : stateToUniqueTransMap.entrySet()) {
       numOfUniqueTransitions = numOfUniqueTransitions + entry.getValue().size();
     }