Merge branch 'encoding'

[satune.git] / src / Encoders / elementencoding.h

diff --git a/src/Encoders/elementencoding.h b/src/Encoders/elementencoding.h
index 27ff2488fb16db80f6544f0a3ec9a36a26316685..6797c66bf530b9024fba0fd3627f43643799ce04 100644 (file)
--- a/src/Encoders/elementencoding.h
+++ b/src/Encoders/elementencoding.h
@@ -4,14 +4,8 @@
 #include "naiveencoder.h"
 #include "constraint.h"
 
-enum ElementEncodingType {
-       ELEM_UNASSIGNED, ONEHOT, UNARY, BINARYINDEX, ONEHOTBINARY, BINARYVAL
-};
-
-typedef enum ElementEncodingType ElementEncodingType;
-
 class ElementEncoding {
- public:
+public:
        ElementEncoding(Element *element);
        ElementEncodingType getElementEncodingType() {return type;}
        ~ElementEncoding();
@@ -36,7 +30,7 @@ class ElementEncoding {
                return -1;
        }
 
-       
+
        ElementEncodingType type;
        Element *element;
        Edge *variables;/* List Variables Used To Encode Element */
@@ -55,7 +49,7 @@ class ElementEncoding {
                };
        };
        uint numVars;   /* Number of variables */
-       MEMALLOC;
+       CMEMALLOC;
 };