X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.h;h=2730a934164a7d267bdf26d47f78576671c8c52a;hp=63ee0fdf057e84b155467f0f66a27105c1ba0813;hb=77f32c79afdf12f29c040d511cd84f15d703ceb9;hpb=1baf38f8e307dbf035530c976979be00f0a1d09e diff --git a/src/csolver.h b/src/csolver.h index 63ee0fd..2730a93 100644 --- a/src/csolver.h +++ b/src/csolver.h @@ -1,9 +1,11 @@ #ifndef CSOLVER_H #define CSOLVER_H -#include "classlist.h" +#include "classes.h" #include "ops.h" -#include "structs.h" +#include "corestructs.h" #include "asthash.h" +#include "solver_interface.h" +#include "common.h" class CSolver { public: @@ -17,12 +19,17 @@ public: Set *createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange); + VarType getSetVarType(Set *set); + + Element *createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange); + /** This function creates a mutable set. */ MutableSet *createMutableSet(VarType type); /** This function adds a new item to a set. */ + //Deprecating this unless we need it... void addItem(MutableSet *set, uint64_t element); /** This function adds a new unique item to the set and returns it. @@ -31,6 +38,11 @@ public: uint64_t createUniqueItem(MutableSet *set); + /** + * Freeze and finalize the mutableSet ... + */ + void finalizeMutableSet(MutableSet *set); + /** This function creates an element variable over a set. */ Element *getElementVar(Set *set); @@ -38,9 +50,15 @@ public: /** This function creates an element constrant. */ Element *getElementConst(VarType type, uint64_t value); + Set *getElementRange (Element *element); + + BooleanEdge getBooleanTrue(); + + BooleanEdge getBooleanFalse(); + /** This function creates a boolean variable. */ - Boolean *getBooleanVar(VarType type); + BooleanEdge getBooleanVar(VarType type); /** This function creates a function operator. */ @@ -68,74 +86,91 @@ public: /** This function applies a function to the Elements in its input. */ - Element *applyFunction(Function *function, Element **array, uint numArrays, Boolean *overflowstatus); + Element *applyFunction(Function *function, Element **array, uint numArrays, BooleanEdge overflowstatus); /** This function applies a predicate to the Elements in its input. */ - Boolean *applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus); + BooleanEdge applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, BooleanEdge undefinedStatus); + + BooleanEdge applyPredicate(Predicate *predicate, Element **inputs, uint numInputs); + + /** This function applies a logical operation to the Booleans in its input. */ + + BooleanEdge applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize); + + /** This function applies a logical operation to the Booleans in its input. */ - Boolean *applyPredicate(Predicate *predicate, Element **inputs, uint numInputs); + BooleanEdge applyLogicalOperation(LogicOp op, BooleanEdge arg1, BooleanEdge arg2); /** This function applies a logical operation to the Booleans in its input. */ - Boolean *applyLogicalOperation(LogicOp op, Boolean **array, uint asize); + BooleanEdge applyLogicalOperation(LogicOp op, BooleanEdge arg); /** This function adds a boolean constraint to the set of constraints to be satisfied */ - void addConstraint(Boolean *constraint); + void addConstraint(BooleanEdge constraint); /** This function instantiates an order of type type over the set set. */ Order *createOrder(OrderType type, Set *set); /** This function instantiates a boolean on two items in an order. */ - Boolean *orderConstraint(Order *order, uint64_t first, uint64_t second); + BooleanEdge orderConstraint(Order *order, uint64_t first, uint64_t second); /** When everything is done, the client calls this function and then csolver starts to encode*/ - int startEncoding(); + int solve(); /** After getting the solution from the SAT solver, client can get the value of an element via this function*/ uint64_t getElementValue(Element *element); /** After getting the solution from the SAT solver, client can get the value of a boolean via this function*/ - bool getBooleanValue(Boolean *boolean); + bool getBooleanValue(BooleanEdge boolean); - HappenedBefore getOrderConstraintValue(Order *order, uint64_t first, uint64_t second); + bool getOrderConstraintValue(Order *order, uint64_t first, uint64_t second); - void setUnSAT() { unsat = true; } + bool isTrue(BooleanEdge b); + bool isFalse(BooleanEdge b); + void setUnSAT() { model_print("Setting UNSAT %%%%%%\n"); unsat = true; } bool isUnSAT() { return unsat; } + void printConstraint(BooleanEdge boolean); + void printConstraints(); + Vector *getOrders() { return &allOrders;} + HashsetOrder *getActiveOrders() { return &activeOrders;} Tuner *getTuner() { return tuner; } - - HSIteratorBoolean *getConstraints() { return constraints.iterator(); } + + SetIteratorBooleanEdge *getConstraints() { return constraints.iterator(); } SATEncoder *getSATEncoder() {return satEncoder;} - void replaceBooleanWithTrue(Boolean *bexpr); - void replaceBooleanWithFalse(Boolean *bexpr); - void replaceBooleanWithBoolean(Boolean *oldb, Boolean *newb); + void replaceBooleanWithTrue(BooleanEdge bexpr); + void replaceBooleanWithTrueNoRemove(BooleanEdge bexpr); + void replaceBooleanWithFalse(BooleanEdge bexpr); + void replaceBooleanWithBoolean(BooleanEdge oldb, BooleanEdge newb); CSolver *clone(); + void serialize(); void autoTune(uint budget); - void setTuner(Tuner * _tuner) { tuner = _tuner; } + void setTuner(Tuner *_tuner) { tuner = _tuner; } long long getElapsedTime() { return elapsedTime; } long long getEncodeTime(); long long getSolveTime(); - - MEMALLOC; + + CMEMALLOC; private: - void handleXORFalse(BooleanLogic *bexpr, Boolean *child); - void handleIMPLIESTrue(BooleanLogic *bexpr, Boolean *child); - void handleIMPLIESFalse(BooleanLogic *bexpr, Boolean *child); - void handleANDTrue(BooleanLogic *bexpr, Boolean *child); - void handleORFalse(BooleanLogic *bexpr, Boolean *child); + void handleIFFTrue(BooleanLogic *bexpr, BooleanEdge child); + void handleANDTrue(BooleanLogic *bexpr, BooleanEdge child); + //These two functions are helpers if the client has a pointer to a + //Boolean object that we have since replaced + BooleanEdge rewriteLogicalOperation(LogicOp op, BooleanEdge *array, uint asize); + BooleanEdge doRewrite(BooleanEdge b); /** This is a vector of constraints that must be satisfied. */ - HashSetBoolean constraints; + HashsetBooleanEdge constraints; /** This is a vector of all boolean structs that we have allocated. */ Vector allBooleans; @@ -155,17 +190,21 @@ private: /** This is a vector of all order structs that we have allocated. */ Vector allOrders; + HashsetOrder activeOrders; + /** This is a vector of all function structs that we have allocated. */ Vector allFunctions; + BooleanEdge boolTrue; + BooleanEdge boolFalse; + /** These two tables are used for deduplicating entries. */ BooleanMatchMap boolMap; ElementMatchMap elemMap; - + SATEncoder *satEncoder; bool unsat; Tuner *tuner; - long long elapsedTime; }; #endif