Clean up merge heuristic to do what we said it did

[satune.git] / src / ASTAnalyses / Encoding / subgraph.h

diff --git a/src/ASTAnalyses/Encoding/subgraph.h b/src/ASTAnalyses/Encoding/subgraph.h
index 0ceb306933152ef9f1232cd620209874b8027214..00264a6c6371f4ba455cf47b4408675fa07d6d79 100644 (file)
--- a/src/ASTAnalyses/Encoding/subgraph.h
+++ b/src/ASTAnalyses/Encoding/subgraph.h
@@ -47,6 +47,7 @@ public:
        uint getEncodingMaxVal(EncodingNode *n) { return maxEncodingVal;}
        double measureSimilarity(EncodingNode *n);
        double measureSimilarity(EncodingSubGraph *sg);
+       uint numValues();
        CMEMALLOC;
 private:
        uint estimateNewSize(EncodingNode *n);
@@ -64,10 +65,8 @@ private:
        HashsetEncodingValue values;
        HashsetEncodingNode nodes;
        NVPMap map;
-       uint encodingSize;
-       uint numElements;
        uint maxEncodingVal;
-
+       Hashset64Int allValues;
        friend class EncodingGraph;
 };