From: amiraj <amiraj.95@uci.edu>
Date: Tue, 17 Dec 2019 01:03:33 +0000 (-0800)
Subject: A change in updateTheOutSet in conflict tracker analysis
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=jpf-core.git;a=commitdiff_plain;h=7fc8507dc2288f94a42c8d4d59107ace9ded3a99;hp=1275e143b0da96e4ba0f45154d07962bcc282920

A change in updateTheOutSet in conflict tracker analysis
---

diff --git a/src/main/gov/nasa/jpf/listener/ConflictTracker.java b/src/main/gov/nasa/jpf/listener/ConflictTracker.java
index 9e2917b..2ba4eca 100644
--- a/src/main/gov/nasa/jpf/listener/ConflictTracker.java
+++ b/src/main/gov/nasa/jpf/listener/ConflictTracker.java
@@ -192,7 +192,6 @@ public class ConflictTracker extends ListenerAdapter {
     Edge edge = parentNode.getOutgoingEdges().get(currentNode);
     HashMap<Transition, ArrayList<NameValuePair>> setSets = edge.getSetSetMap();
     HashSet<String> updatedVarNames = new HashSet<String>();
-    HashSet<String> outSetVarMap = new HashSet<String>();
     boolean isChanged = false;
 
     for (Map.Entry mapElement : setSets.entrySet()) {
@@ -204,7 +203,6 @@ public class ConflictTracker extends ListenerAdapter {
     }
 
     for (NameValuePair i : parentNode.getOutSet()) {
-      outSetVarMap.add(i.getVarName());
       if (!updatedVarNames.contains(i.getVarName()))
         isChanged |= currentNode.getOutSet().add(i);
     }
@@ -212,11 +210,6 @@ public class ConflictTracker extends ListenerAdapter {
     ArrayList<NameValuePair> lastSetSet = setSets.get(edge.getFinalTransition());
 
     for (int i = 0;i < lastSetSet.size();i++) {
-      String var = lastSetSet.get(i).getVarName();
-
-      if (outSetVarMap.contains(var)) {
-        currentNode.getOutSet().remove(lastSetSet.get(i));
-      }
       isChanged |= currentNode.getOutSet().add(lastSetSet.get(i));
     }
     return isChanged;