From: Hamed <hamed.gorjiara@gmail.com>
Date: Sat, 24 Jun 2017 02:03:16 +0000 (-0700)
Subject: Fixing bug with running the test
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=65480875f257cf6f2793ca1e348d94931a1a811a;p=satune.git

Fixing bug with running the test
---

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index b026357..243ea4d 100644
--- 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 7e0a746..74cfb76 100644
--- 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 83c492f..d5ceab6 100644
--- 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 7f839e0..c1623eb 100644
--- 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);