Fix some bugs, Moving backend codes to SATEncoder

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

diff --git a/src/Encoders/elementencoding.c b/src/Encoders/elementencoding.c
index fc76a4ad14d69c6d7dae6cb42b687d2b4f505eb0..7b3ebddf6f1c38c4fb6113440cdf583b990f38b3 100644 (file)
--- a/src/Encoders/elementencoding.c
+++ b/src/Encoders/elementencoding.c
@@ -2,6 +2,7 @@
 #include "common.h"
 #include "naiveencoder.h"
 #include "element.h"
+#include "satencoder.h"
 
 void initElementEncoding(ElementEncoding * This, Element *element) {
        This->element=element;
@@ -38,14 +39,14 @@ void setElementEncodingType(ElementEncoding* This, ElementEncodingType type){
        This->type = type;
 }
 
-void generateBinaryIndexEncodingVars(NaiveEncoder* encoder, ElementEncoding* This){
+void generateBinaryIndexEncodingVars(SATEncoder* encoder, ElementEncoding* This){
        ASSERT(This->type==BINARYINDEX);
        uint size = getElementSize(This->element);
        allocElementConstraintVariables(This, NUMBITS(size-1));
-       getArrayNewVars(encoder, This->numVars, This->variables);
+       getArrayNewVarsSATEncoder(encoder, This->numVars, This->variables);
 }
 
-void generateElementEncodingVariables(NaiveEncoder* encoder, ElementEncoding* This){
+void generateElementEncodingVariables(SATEncoder* encoder, ElementEncoding* This){
        ASSERT(This->type!=ELEM_UNASSIGNED);
        ASSERT(This->variables==NULL);
        switch(This->type){