X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.h;h=63ba766206e5d125fbc074babcf84eb22271e866;hp=1d398ce9b4736aaeab384232258da29f9e9ae35f;hb=a60327c3c9d0f6ad9365aa042162a6c042a62402;hpb=50bc134b69455d4b1b178e99db38d83e7285bed5

diff --git a/src/csolver.h b/src/csolver.h
index 1d398ce..63ba766 100644
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -2,38 +2,40 @@
 #define CSOLVER_H
 #include "classlist.h"
 #include "ops.h"
+#include "structs.h"
 
-class CSolver {
-public:
-	CSolver();
-
-	Set * createSet(Type type, uint64_t ** elements);
-	Set * createSet(Type type, uint64_t lowrange, uint64_t highrange);
-	MutableSet * createMutableSet(Type type);
+struct CSolver {
+	VectorBoolean * constraints;
+	VectorSet * sets;
+	VectorElement * elements;
+};
 
-	void addItem(MutableSet * set, uint64_t element);
-	int64_t createUniqueItem(MutableSet * set);
+CSolver * allocCSolver();
+Set * createSet(CSolver *, VarType type, uint64_t * elements, uint num);
+Set * createRangeSet(CSolver *, VarType type, uint64_t lowrange, uint64_t highrange);
+MutableSet * createMutableSet(CSolver *, VarType type);
 
-	Element * getElementVar(Set * set);
-	Constraint * getBooleanVar();
+void addItem(CSolver *, MutableSet * set, uint64_t element);
+uint64_t createUniqueItem(CSolver *, MutableSet * set);
 
-	Function * createFunctionOperator(enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Constraint * overflowstatus);
-	Function * createFunctionOperator(enum ArithOp op);																																																										//Does Not Overflow
-	Predicate * createPredicateOperator(enum CompOp op, Set ** domain);
+Element * getElementVar(CSolver *, Set * set);
+Boolean * getBooleanVar(CSolver *, VarType type);
 
-	Table * createTable(Set **domains, Set * range);
-	void addTableEntry(Element ** inputs, Element *result);
-	Function * completeTable(struct Table *);
+Function * createFunctionOperator(CSolver *, enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus);
+//Does Not Overflow
+Function * createFunctionOperatorPure(CSolver *, enum ArithOp op);
+Predicate * createPredicateOperator(CSolver *, enum CompOp op, Set ** domain);
 
-	Element * applyFunction(Function * function, Element ** array);
-	Constraint * applyPredicate(Predicate * predicate, Element ** inputs);
-	Constraint * applyLogicalOperation(enum LogicOp op, Constraint ** array);
+Table * createTable(CSolver *, Set **domains, Set * range);
+void addTableEntry(CSolver *, Element ** inputs, Element *result);
+Function * completeTable(CSolver *, struct Table *);
 
-	void addConstraint(Constraint * constraint);
+Element * applyFunction(CSolver *, Function * function, Element ** array);
+Boolean * applyPredicate(CSolver *, Predicate * predicate, Element ** inputs);
+Boolean * applyLogicalOperation(CSolver *, enum LogicOp op, Boolean ** array);
 
-	Order * createOrder(enum OrderType type, Set * set);
-	Constraint * orderedConstraint(Order * order, uint64_t first, uint64_t second);
-private:
+void addBoolean(CSolver *, Boolean * constraint);
 
-};
+Order * createOrder(CSolver *, enum OrderType type, Set * set);
+Boolean * orderConstraint(CSolver *, Order * order, uint64_t first, uint64_t second);
 #endif