projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Interpreter abstraction and memory bug fixes
[satune.git]
/
src
/
csolver.h
diff --git
a/src/csolver.h
b/src/csolver.h
index 15da42e58946c1ec8703c6b08300801863144a27..7da50c55b9bf60667e994cf50bb8178d5f009f3d 100644
(file)
--- a/
src/csolver.h
+++ b/
src/csolver.h
@@
-5,12
+5,13
@@
#include "corestructs.h"
#include "asthash.h"
#include "solver_interface.h"
#include "corestructs.h"
#include "asthash.h"
#include "solver_interface.h"
+#include "common.h"
class CSolver {
public:
CSolver();
~CSolver();
class CSolver {
public:
CSolver();
~CSolver();
-
+ void resetSolver();
/** This function creates a set containing the elements passed in the array. */
Set *createSet(VarType type, uint64_t *elements, uint num);
/** This function creates a set containing the elements passed in the array. */
Set *createSet(VarType type, uint64_t *elements, uint num);
@@
-18,11
+19,16
@@
public:
Set *createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange);
Set *createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange);
+ bool itemExistInSet(Set *set, uint64_t item);
+
VarType getSetVarType(Set *set);
VarType getSetVarType(Set *set);
-
+
Element *createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange);
Element *createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange);
- /** This function creates a mutable set. */
+ /** This function creates a mutable set.
+ * Note: You should use addItem for adding new item to Mutable sets, and
+ * at the end, you should call finalizeMutableSet!
+ */
MutableSet *createMutableSet(VarType type);
MutableSet *createMutableSet(VarType type);
@@
-36,11
+42,11
@@
public:
items to the set. */
uint64_t createUniqueItem(MutableSet *set);
items to the set. */
uint64_t createUniqueItem(MutableSet *set);
-
+
/**
* Freeze and finalize the mutableSet ...
*/
/**
* Freeze and finalize the mutableSet ...
*/
- void finalizeMutableSet(MutableSet
*
set);
+ void finalizeMutableSet(MutableSet
*
set);
/** This function creates an element variable over a set. */
/** This function creates an element variable over a set. */
@@
-48,8
+54,10
@@
public:
/** This function creates an element constrant. */
Element *getElementConst(VarType type, uint64_t value);
/** This function creates an element constrant. */
Element *getElementConst(VarType type, uint64_t value);
-
- Set* getElementRange (Element* element);
+
+ Set *getElementRange (Element *element);
+
+ void mustHaveValue(Element *element);
BooleanEdge getBooleanTrue();
BooleanEdge getBooleanTrue();
@@
-61,20
+69,20
@@
public:
/** This function creates a function operator. */
/** This function creates a function operator. */
- Function *createFunctionOperator(ArithOp op, Set *
*domain, uint numDomain, Set *
range,
+ Function *createFunctionOperator(ArithOp op, Set *range,
OverFlowBehavior overflowbehavior);
/** This function creates a predicate operator. */
OverFlowBehavior overflowbehavior);
/** This function creates a predicate operator. */
- Predicate *createPredicateOperator(CompOp op
, Set **domain, uint numDomain
);
+ Predicate *createPredicateOperator(CompOp op);
Predicate *createPredicateTable(Table *table, UndefinedBehavior behavior);
/** This function creates an empty instance table.*/
Predicate *createPredicateTable(Table *table, UndefinedBehavior behavior);
/** This function creates an empty instance table.*/
- Table *createTable(Set *
*domains, uint numDomain, Set *
range);
+ Table *createTable(Set *range);
- Table *createTableForPredicate(
Set **domains, uint numDomain
);
+ Table *createTableForPredicate();
/** This function adds an input output relation to a table. */
void addTableEntry(Table *table, uint64_t *inputs, uint inputSize, uint64_t result);
/** This function adds an input output relation to a table. */
void addTableEntry(Table *table, uint64_t *inputs, uint inputSize, uint64_t result);
@@
-130,37
+138,47
@@
public:
bool isTrue(BooleanEdge b);
bool isFalse(BooleanEdge b);
bool isTrue(BooleanEdge b);
bool isFalse(BooleanEdge b);
- void setUnSAT() { unsat = true; }
-
+ void setUnSAT() {
model_print("Setting UNSAT %%%%%%\n");
unsat = true; }
+ void setSatSolverTimeout(long seconds) { satsolverTimeout = seconds;}
bool isUnSAT() { return unsat; }
bool isUnSAT() { return unsat; }
+ bool isBooleanVarUsed(){return booleanVarUsed;}
+ void printConstraint(BooleanEdge boolean);
+ void printConstraints();
Vector<Order *> *getOrders() { return &allOrders;}
Vector<Order *> *getOrders() { return &allOrders;}
- HashsetOrder *
getActiveOrders() { return &activeOrders;}
+ HashsetOrder *getActiveOrders() { return &activeOrders;}
Tuner *getTuner() { return tuner; }
Tuner *getTuner() { return tuner; }
- SetIteratorBooleanEdge *
getConstraints() { return constraints.iterator(); }
+ SetIteratorBooleanEdge *getConstraints() { return constraints.iterator(); }
SATEncoder *getSATEncoder() {return satEncoder;}
void replaceBooleanWithTrue(BooleanEdge bexpr);
void replaceBooleanWithTrueNoRemove(BooleanEdge bexpr);
SATEncoder *getSATEncoder() {return satEncoder;}
void replaceBooleanWithTrue(BooleanEdge bexpr);
void replaceBooleanWithTrueNoRemove(BooleanEdge bexpr);
+ void replaceBooleanWithFalseNoRemove(BooleanEdge bexpr);
void replaceBooleanWithFalse(BooleanEdge bexpr);
void replaceBooleanWithBoolean(BooleanEdge oldb, BooleanEdge newb);
CSolver *clone();
void serialize();
void replaceBooleanWithFalse(BooleanEdge bexpr);
void replaceBooleanWithBoolean(BooleanEdge oldb, BooleanEdge newb);
CSolver *clone();
void serialize();
+ static CSolver *deserialize(const char *file, bool alloy = false);
void autoTune(uint budget);
void autoTune(uint budget);
-
+ void inferFixedOrders();
+ void inferFixedOrder(Order *order);
+ void setAlloyEncoder();
+ bool useAlloyCompiler() {return interpreter != NULL;}
void setTuner(Tuner *_tuner) { tuner = _tuner; }
long long getElapsedTime() { return elapsedTime; }
long long getEncodeTime();
long long getSolveTime();
void setTuner(Tuner *_tuner) { tuner = _tuner; }
long long getElapsedTime() { return elapsedTime; }
long long getEncodeTime();
long long getSolveTime();
+ long getSatSolverTimeout() { return satsolverTimeout;}
CMEMALLOC;
private:
void handleIFFTrue(BooleanLogic *bexpr, BooleanEdge child);
void handleANDTrue(BooleanLogic *bexpr, BooleanEdge child);
CMEMALLOC;
private:
void handleIFFTrue(BooleanLogic *bexpr, BooleanEdge child);
void handleANDTrue(BooleanLogic *bexpr, BooleanEdge child);
+ void handleFunction(ElementFunction *ef, BooleanEdge child);
//These two functions are helpers if the client has a pointer to a
//Boolean object that we have since replaced
//These two functions are helpers if the client has a pointer to a
//Boolean object that we have since replaced
@@
-188,7
+206,7
@@
private:
Vector<Order *> allOrders;
HashsetOrder activeOrders;
Vector<Order *> allOrders;
HashsetOrder activeOrders;
-
+
/** This is a vector of all function structs that we have allocated. */
Vector<Function *> allFunctions;
/** This is a vector of all function structs that we have allocated. */
Vector<Function *> allFunctions;
@@
-201,7
+219,44
@@
private:
SATEncoder *satEncoder;
bool unsat;
SATEncoder *satEncoder;
bool unsat;
- Tuner *tuner;
+ bool booleanVarUsed;
+ Tuner *tuner;
long long elapsedTime;
long long elapsedTime;
+ long satsolverTimeout;
+ Interpreter *interpreter;
+ friend class ElementOpt;
+ friend class VarOrderingOpt;
};
};
+
+inline CompOp flipOp(CompOp op) {
+ switch (op) {
+ case SATC_EQUALS:
+ return SATC_EQUALS;
+ case SATC_LT:
+ return SATC_GT;
+ case SATC_GT:
+ return SATC_LT;
+ case SATC_LTE:
+ return SATC_GTE;
+ case SATC_GTE:
+ return SATC_LTE;
+ }
+ ASSERT(0);
+}
+
+inline CompOp negateOp(CompOp op) {
+ switch (op) {
+ case SATC_EQUALS:
+ ASSERT(0);
+ case SATC_LT:
+ return SATC_GTE;
+ case SATC_GT:
+ return SATC_LTE;
+ case SATC_LTE:
+ return SATC_GT;
+ case SATC_GTE:
+ return SATC_LT;
+ }
+ ASSERT(0);
+}
#endif
#endif