Clean up merge heuristic to do what we said it did

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

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.h b/src/ASTAnalyses/Encoding/encodinggraph.h
index 96c163efd03f1c0b7befbcf5baeaf54d41437104..b53568ec6869a7a0cc4db98988ff779ca5221e57 100644 (file)
--- a/src/ASTAnalyses/Encoding/encodinggraph.h
+++ b/src/ASTAnalyses/Encoding/encodinggraph.h
@@ -4,8 +4,6 @@
 #include "structs.h"
 #include "graphstructs.h"
 
-#define FUDGEFACTOR 1.2
-#define CONVERSIONFACTOR  0.5
 
 class EncodingGraph {
 public:
@@ -47,7 +45,6 @@ public:
        double measureSimilarity(EncodingNode *node);
        void setEncoding(ElementEncodingType e) {encoding = e;}
        ElementEncodingType getEncoding() {return encoding;}
-       bool itemExists(uint64_t item);
        bool couldBeBinaryIndex() {return encoding == BINARYINDEX || encoding == ELEM_UNASSIGNED;}
        CMEMALLOC;
 private: