Fix tabbing

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index aedef9391ea27c586b5b838e38c1cbf21611cb5a..95809dda5b7bb5db420feee6ce23824313b8592f 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -16,8 +16,18 @@ struct CSolver {
 
        /** 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. */
@@ -61,7 +71,7 @@ Function * createFunctionOperator(CSolver *solver, ArithOp op, Set ** domain, ui
 
 /** 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.*/
 
@@ -77,15 +87,15 @@ Function * completeTable(CSolver *, Table *);
 
 /** This function applies a function to the Elements in its input. */
 
-Element * applyFunction(CSolver *, Function * function, Element ** array, Boolean * overflowstatus);
+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 */
@@ -93,7 +103,7 @@ 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);