Simplified conditional logic

tsantalis · Mar 30, 2024 · 61bb1af · 61bb1af
1 parent beac371
commit 61bb1af
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/StringBasedHeuristics.java b/src/main/java/gr/uom/java/xmi/decomposition/StringBasedHeuristics.java
@@ -3278,17 +3278,15 @@ else if(ifNodes1.size() > ifNodes2.size()) {
 							for(CompositeStatementObject comp1 : ifNodes1) {
 								List<AbstractCodeFragment> leaves1 = comp1.getLeaves();
 								for(AbstractCodeFragment leaf1 : leaves1) {
-									for(String s : ternaryConditionals2) {
+									for(String s : subConditionMap2.keySet()) {
 										List<LeafExpression> leafExpressions1 = leaf1.findExpression(s);
-										if(subConditionMap2.containsKey(s)) {
-											List<LeafExpression> leafExpressions2 = subConditionMap2.get(s);
-											if(leafExpressions1.size() == leafExpressions2.size()) {
-												for(int i=0; i<leafExpressions1.size(); i++) {
-													LeafMapping leafMapping = new LeafMapping(leafExpressions1.get(i), leafExpressions2.get(i), container1, container2);
-													r.addSubExpressionMapping(leafMapping);
-												}
-												break;
+										List<LeafExpression> leafExpressions2 = subConditionMap2.get(s);
+										if(leafExpressions1.size() == leafExpressions2.size()) {
+											for(int i=0; i<leafExpressions1.size(); i++) {
+												LeafMapping leafMapping = new LeafMapping(leafExpressions1.get(i), leafExpressions2.get(i), container1, container2);
+												r.addSubExpressionMapping(leafMapping);
 											}
+											break;
 										}
 									}
 								}