more edits

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

diff --git a/src/Encoders/elementencoding.c b/src/Encoders/elementencoding.c
index 08eb2e8dd6200fa403a6b910616597232508e406..47c6ea0fef0f52f917ce7b69e4e09786b3d92e92 100644 (file)
--- a/src/Encoders/elementencoding.c
+++ b/src/Encoders/elementencoding.c
@@ -29,32 +29,12 @@ void allocEncodingArrayElement(ElementEncoding *This, uint size) {
 }
 
 void allocInUseArrayElement(ElementEncoding *This, uint size) {
-       This->inUseArray=ourcalloc(1, size >> 6);
-}
-
-void allocElementConstraintVariables(ElementEncoding* This, uint numVars){
-       This->numVars = numVars;
-       This->variables = ourmalloc(sizeof(Constraint*) * numVars);
+       uint bytes = ((size + ((1 << 9)-1)) >> 6)&~7;//Depends on size of inUseArray
+       This->inUseArray=ourcalloc(1, bytes);
 }
 
 void setElementEncodingType(ElementEncoding* This, ElementEncodingType type){
        This->type = type;
 }
 
-void generateBinaryIndexEncodingVars(SATEncoder* encoder, ElementEncoding* This){
-       ASSERT(This->type==BINARYINDEX);
-       allocElementConstraintVariables(This, NUMBITS(This->encArraySize-1));
-       getArrayNewVarsSATEncoder(encoder, This->numVars, This->variables);
-}
 
-void generateElementEncodingVariables(SATEncoder* encoder, ElementEncoding* This){
-       ASSERT(This->type!=ELEM_UNASSIGNED);
-       ASSERT(This->variables==NULL);
-       switch(This->type){
-               case BINARYINDEX:
-                       generateBinaryIndexEncodingVars(encoder, This);
-                       break;
-               default:
-                       ASSERT(0);
-       }
-}