projects
/
jpf-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1275e14
)
A change in updateTheOutSet in conflict tracker analysis
author
amiraj
<amiraj.95@uci.edu>
Tue, 17 Dec 2019 01:03:33 +0000
(17:03 -0800)
committer
amiraj
<amiraj.95@uci.edu>
Tue, 17 Dec 2019 01:03:33 +0000
(17:03 -0800)
src/main/gov/nasa/jpf/listener/ConflictTracker.java
patch
|
blob
|
history
diff --git
a/src/main/gov/nasa/jpf/listener/ConflictTracker.java
b/src/main/gov/nasa/jpf/listener/ConflictTracker.java
index 9e2917b0098c5a83b3b826b240cb23ccf54654b2..2ba4eca77a79eef876af31ceac8a11bd52f48763 100644
(file)
--- 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>();
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()) {
boolean isChanged = false;
for (Map.Entry mapElement : setSets.entrySet()) {
@@
-204,7
+203,6
@@
public class ConflictTracker extends ListenerAdapter {
}
for (NameValuePair i : parentNode.getOutSet()) {
}
for (NameValuePair i : parentNode.getOutSet()) {
- outSetVarMap.add(i.getVarName());
if (!updatedVarNames.contains(i.getVarName()))
isChanged |= currentNode.getOutSet().add(i);
}
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++) {
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;
isChanged |= currentNode.getOutSet().add(lastSetSet.get(i));
}
return isChanged;