From 61bb1afb92d61e7a2c9b65f8041701bf28221671 Mon Sep 17 00:00:00 2001
From: tsantalis <tsantalis@gmail.com>
Date: Sat, 30 Mar 2024 09:31:33 -0400
Subject: [PATCH] Simplified conditional logic

---
 .../xmi/decomposition/StringBasedHeuristics.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 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
index 2bceace69b..b5d52f74dd 100644
--- 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;
 										}
 									}
 								}