commit after resolving conflicts

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index d3bce42f5cef554247fdd76ee3027d172c84dd31..aedef9391ea27c586b5b838e38c1cbf21611cb5a 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -16,6 +16,8 @@ struct CSolver {
 
        /** This is a vector of all element structs that we have allocated. */
        VectorElement * allElements;
+       VectorPredicate * allPredicates;
+       VectorTable * allTables;
 };
 
 /** Create a new solver instance. */
@@ -67,7 +69,7 @@ Table * createTable(CSolver *solver, Set **domains, uint numDomain, Set * range)
 
 /** This function adds an input output relation to a table. */
 
-void addTableEntry(CSolver *solver, uint64_t* inputs, uint inputSize, uint64_t result);
+void addTableEntry(CSolver *solver, Table* table, uint64_t* inputs, uint inputSize, uint64_t result);
 
 /** This function converts a completed table into a function. */
 
@@ -93,6 +95,6 @@ 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);
 
-/** This function instantiates a predicate on two items in an order. */
+/** This function instantiates a boolean on two items in an order. */
 Boolean * orderConstraint(CSolver *, Order * order, uint64_t first, uint64_t second);
 #endif