BUG FIX:Timeout getting stuck bug

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

diff --git a/src/Encoders/naiveencoder.h b/src/Encoders/naiveencoder.h
index d3c409ce0df66ea402ceaedcf0eed6ad646076b1..fe84a2b64eb874b13fc6ba284e1dba3080feb5b6 100644 (file)
--- a/src/Encoders/naiveencoder.h
+++ b/src/Encoders/naiveencoder.h
@@ -3,28 +3,15 @@
 #include "classlist.h"
 #include "structs.h"
 
-#define GETNAIVEENCODERVARS(ne) (&((NaiveEncoder*)ne)->vars)
-#define GETNAIVEENCODERALLCONSTRAINTS(ne) (&((NaiveEncoder*)ne)->allConstraints)
+/**
+ * The NaiveEncoder assigns a predefined Encoding to each Element and Function.
+ * @param csolver
+ * @param encoder
+ */
 
-struct NaiveEncoder{
-       uint varindex;
-       VectorConstraint vars;
-       VectorConstraint allConstraints;
-};
-
-NaiveEncoder* allocNaiveEncoder();
-Constraint* getNewVar(NaiveEncoder* encoder);
-void getArrayNewVars(NaiveEncoder* encoder, uint num, Constraint **carray);
-//For now, This function just simply goes through elements/functions and 
-//assigns a predefined Encoding to each of them
-void naiveEncodingDecision(CSolver* csolver, NaiveEncoder* encoder);
-void encode(CSolver* csolver);
-void baseBinaryIndexElementAssign(ElementEncoding *This);
-void naiveEncodeFunctionPredicate(NaiveEncoder* encoder, FunctionEncoding *This);
-void naiveEncodeCircuitFunction(NaiveEncoder* encoder, FunctionEncoding* This);
-void naiveEncodeEnumeratedFunction(NaiveEncoder* encoder, FunctionEncoding* This);
-void naiveEncodeEnumTableFunc(NaiveEncoder* encoder, ElementFunction* This);
-void naiveEncodeEnumOperatingFunc(NaiveEncoder* encoder, ElementFunction* This);
-
-void deleteNaiveEncoder(NaiveEncoder* encoder);
+void naiveEncodingDecision(CSolver *csolver);
+void naiveEncodingConstraint(CSolver *csolver, Boolean *This);
+void naiveEncodingLogicOp(CSolver *csolver, BooleanLogic *This);
+void naiveEncodingPredicate(CSolver *csolver, BooleanPredicate *This);
+void naiveEncodingElement(CSolver *csolver, Element *This);
 #endif