From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Tue, 23 Oct 2018 00:40:20 +0000 (-0700)
Subject: Adding the missing bug fix for the merge heuristic ...
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c5583ef2d72b2ed4cd6ced0b899d17927d27314;p=satune.git

Adding the missing bug fix for the merge heuristic ...
---

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.cc b/src/ASTAnalyses/Encoding/encodinggraph.cc
index d2791d3..6ebea56 100644
--- a/src/ASTAnalyses/Encoding/encodinggraph.cc
+++ b/src/ASTAnalyses/Encoding/encodinggraph.cc
@@ -342,6 +342,8 @@ void EncodingGraph::decideEdges() {
 			newSize = convertSize(left->s->getUnionSize(right->s));
 			newSize = (leftSize > newSize) ? leftSize : newSize;
 			newSize = (rightSize > newSize) ? rightSize : newSize;
+			max = rightSize > leftSize ? rightSize : leftSize;
+			merge = left->measureSimilarity(right) > 1.5 || max == newSize;
 		} else if (leftGraph != NULL && rightGraph == NULL) {
 			leftSize = convertSize(leftGraph->encodingSize);
 			rightSize = convertSize(right->getSize());