Merge branch 'master' into brian

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index 0093586600778d9c34bc4615884df69a45f3f25d..bd90bf3054a5cbf85e4b506097391c2786e51d7d 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -5,18 +5,39 @@
 #include "structs.h"
 
 struct CSolver {
+       /** This is a vector of constraints that must be satisfied. */
        VectorBoolean * constraints;
+
+       /** This is a vector of all boolean structs that we have allocated. */
        VectorBoolean * allBooleans;
+
+       /** This is a vector of all set structs that we have allocated. */
        VectorSet * allSets;
+
+       /** This is a vector of all element structs that we have allocated. */
        VectorElement * allElements;
+
+       /** This is a vector of all predicate structs that we have allocated. */
        VectorPredicate * allPredicates;
+
+       /** This is a vector of all table structs that we have allocated. */
        VectorTable * allTables;
+
+       /** This is a vector of all order structs that we have allocated. */
+       VectorOrder * allOrders;
+
+       /** This is a vector of all function structs that we have allocated. */
+       VectorFunction* allFunctions;
 };
 
 /** Create a new solver instance. */
 
 CSolver * allocCSolver();
 
+/** Delete solver instance. */
+
+void deleteSolver(CSolver * This);
+
 /** This function creates a set containing the elements passed in the array. */
 
 Set * createSet(CSolver *, VarType type, uint64_t * elements, uint num);
@@ -49,12 +70,12 @@ Boolean * getBooleanVar(CSolver *, VarType type);
 
 /** This function creates a function operator. */
 
-Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range,
-                                                                                                                                       enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus);
+Function * createFunctionOperator(CSolver *solver, ArithOp op, Set ** domain, uint numDomain, Set * range,
+                                                                                                                                       OverFlowBehavior overflowbehavior);
 
 /** This function creates a predicate operator. */
 
-Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain, uint numDomain);
+Predicate * createPredicateOperator(CSolver *solver, CompOp op, Set ** domain, uint numDomain);
 
 /** This function creates an empty instance table.*/
 
@@ -70,15 +91,15 @@ Function * completeTable(CSolver *, Table *);
 
 /** This function applies a function to the Elements in its input. */
 
-Element * applyFunction(CSolver *, Function * function, Element ** array);
+Element * applyFunction(CSolver *, Function * function, Element ** array, uint numArrays, Boolean * overflowstatus);
 
 /** This function applies a predicate to the Elements in its input. */
 
-Boolean * applyPredicate(CSolver *, Predicate * predicate, Element ** inputs);
+Boolean * applyPredicate(CSolver *, Predicate * predicate, Element ** inputs, uint numInputs);
 
 /** This function applies a logical operation to the Booleans in its input. */
 
-Boolean * applyLogicalOperation(CSolver *, enum LogicOp op, Boolean ** array);
+Boolean * applyLogicalOperation(CSolver *, LogicOp op, Boolean ** array, uint asize);
 
 /** This function adds a boolean constraint to the set of constraints
     to be satisfied */
@@ -86,8 +107,11 @@ Boolean * applyLogicalOperation(CSolver *, enum LogicOp op, Boolean ** array);
 void addBoolean(CSolver *, Boolean * constraint);
 
 /** This function instantiates an order of type type over the set set. */
-Order * createOrder(CSolver *, enum OrderType type, Set * set);
+Order * createOrder(CSolver *, OrderType type, Set * set);
 
 /** This function instantiates a boolean on two items in an order. */
 Boolean * orderConstraint(CSolver *, Order * order, uint64_t first, uint64_t second);
+
+/** When everything is done, the client calls this function and then csolver starts to encode*/
+void startEncoding(CSolver*);
 #endif