Fixing bug with running the test

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index b026357c85f160505502c3981c59bebc1fd5af8d..243ea4d94ce5bd5404b657c59158a4a73dd99127 100644 (file)
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@ -21,8 +21,6 @@ VectorDef(Element, Element *, 4);
 VectorDef(Order, Order *, 4);
 VectorDef(TableEntry, TableEntry *, 4);
 VectorDef(ASTNode, ASTNode *, 4);
-VectorDef(FunctionEncoding, FunctionEncoding *, 4);
-VectorDef(ElementEncoding, ElementEncoding *, 4);
 VectorDef(Int, uint64_t, 4);
 
 

diff --git a/src/Encoders/functionencoding.c b/src/Encoders/functionencoding.c
index 7e0a746639ecd4a2cde0046f1bcad152a78f9304..74cfb7685abc3d017b41d7e7d7edb6920525a55e 100644 (file)
--- a/src/Encoders/functionencoding.c
+++ b/src/Encoders/functionencoding.c
@@ -11,7 +11,6 @@ void initPredicateEncoding(FunctionEncoding *This,  Boolean *predicate) {
 }
 
 void deleteFunctionEncoding(FunctionEncoding *This) {
-       ourfree(This);
 }
 
 void setFunctionEncodingType(FunctionEncoding* encoding, FunctionEncodingType type){

diff --git a/src/Encoders/naiveencoder.c b/src/Encoders/naiveencoder.c
index 83c492f87173aa21165421f9f6665f8d462e1984..d5ceab6bfde261bebcf7963a99baf3271edd2a58 100644 (file)
--- a/src/Encoders/naiveencoder.c
+++ b/src/Encoders/naiveencoder.c
@@ -11,7 +11,7 @@
 #include "table.h"
 #include <strings.h>
 
-void makeEncodingDecisions(CSolver* csolver){
+void naiveEncodingDecision(CSolver* csolver){
        uint size = getSizeVectorElement(csolver->allElements);
        for(uint i=0; i<size; i++){
                Element* element = getVectorElement(csolver->allElements, i);

diff --git a/src/Encoders/naiveencoder.h b/src/Encoders/naiveencoder.h
index 7f839e0e55d6f80da23473d706e2771b283ab7e6..c1623ebdc911d7ba529fe3687471a98e961f4bed 100644 (file)
--- a/src/Encoders/naiveencoder.h
+++ b/src/Encoders/naiveencoder.h
@@ -4,7 +4,7 @@
 
 //For now, This function just simply goes through elements/functions and 
 //assigns a predefined Encoding to each of them
-void makeEncodingDecisions(CSolver* csolver);
+void naiveEncodingDecision(CSolver* csolver);
 void encode(CSolver* csolver);
 void baseBinaryIndexElementAssign(ElementEncoding *This);
 void naiveEncodeFunctionPredicate( FunctionEncoding *This);