Merge branch 'hamed' into brian

[satune.git] / src / csolver.c

diff --git a/src/csolver.c b/src/csolver.c
index a7af8d304d1a66bcb3029967d992f6a0294a46ea..1d31e42558a70bcf1ca3af8be314d0d3ec342762 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -7,6 +7,7 @@
 #include "order.h"
 #include "table.h"
 #include "function.h"
+#include "satencoder.h"
 
 CSolver * allocCSolver() {
        CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
@@ -49,7 +50,7 @@ void deleteSolver(CSolver *This) {
                deleteTable(getVectorTable(This->allTables, i));
        }
        deleteVectorTable(This->allTables);
-       
+
        size=getSizeVectorPredicate(This->allPredicates);
        for(uint i=0;i<size;i++) {
                deletePredicate(getVectorPredicate(This->allPredicates, i));
@@ -61,7 +62,7 @@ void deleteSolver(CSolver *This) {
                deleteOrder(getVectorOrder(This->allOrders, i));
        }
        deleteVectorOrder(This->allOrders);
-       
+
        size=getSizeVectorFunction(This->allFunctions);
        for(uint i=0;i<size;i++) {
                deleteFunction(getVectorFunction(This->allFunctions, i));
@@ -99,7 +100,7 @@ uint64_t createUniqueItem(CSolver *solver, MutableSet * set) {
 }
 
 Element * getElementVar(CSolver *This, Set * set) {
-       Element * element=allocElement(set);
+       Element * element=allocElementSet(set);
        pushVectorElement(This->allElements, element);
        return element;
 }
@@ -111,13 +112,13 @@ Boolean * getBooleanVar(CSolver *solver, VarType type) {
 }
 
 Function * createFunctionOperator(CSolver *solver, ArithOp op, Set ** domain, uint numDomain, Set * range,OverFlowBehavior overflowbehavior) {
-    Function* function = allocFunctionOperator(op, domain, numDomain, range, overflowbehavior);
-    pushVectorFunction(solver->allFunctions, function);
-    return function;
+       Function* function = allocFunctionOperator(op, domain, numDomain, range, overflowbehavior);
+       pushVectorFunction(solver->allFunctions, function);
+       return function;
 }
 
 Predicate * createPredicateOperator(CSolver *solver, CompOp op, Set ** domain, uint numDomain) {
-       Predicate* predicate= allocPredicate(op, domain,numDomain);
+       Predicate* predicate= allocPredicateOperator(op, domain,numDomain);
        pushVectorPredicate(solver->allPredicates, predicate);
        return predicate;
 }
@@ -129,25 +130,29 @@ Table * createTable(CSolver *solver, Set **domains, uint numDomain, Set * range)
 }
 
 void addTableEntry(CSolver *solver, Table* table, uint64_t* inputs, uint inputSize, uint64_t result) {
-    addNewTableEntry(table,inputs, inputSize,result);
+       addNewTableEntry(table,inputs, inputSize,result);
 }
 
 Function * completeTable(CSolver *solver, Table * table) {
-    Function* function = allocFunctionTable(table);
-    pushVectorFunction(solver->allFunctions,function);
-    return function;
+       Function* function = allocFunctionTable(table);
+       pushVectorFunction(solver->allFunctions,function);
+       return function;
 }
 
 Element * applyFunction(CSolver *solver, Function * function, Element ** array, uint numArrays, Boolean * overflowstatus) {
-       return NULL;
+       Element* element= allocElementFunction(function,array,numArrays,overflowstatus);
+       pushVectorElement(solver->allElements, element);
+       return element;
 }
 
 Boolean * applyPredicate(CSolver *solver, Predicate * predicate, Element ** inputs, uint numInputs) {
-       return NULL;
+       Boolean* boolean= allocBooleanPredicate(predicate, inputs, numInputs);
+       pushVectorBoolean(solver->allBooleans, boolean);
+       return boolean;
 }
 
-Boolean * applyLogicalOperation(CSolver *solver, LogicOp op, Boolean ** array) {
-       return NULL;
+Boolean * applyLogicalOperation(CSolver *solver, LogicOp op, Boolean ** array, uint asize) {
+       return allocBooleanLogicArray(solver, op, array, asize);
 }
 
 void addBoolean(CSolver *This, Boolean * constraint) {
@@ -165,3 +170,15 @@ Boolean * orderConstraint(CSolver *solver, Order * order, uint64_t first, uint64
        pushVectorBoolean(solver->allBooleans,constraint);
        return constraint;
 }
+
+void startEncoding(CSolver* solver){
+       naiveEncodingDecision(solver);
+       SATEncoder* satEncoder = allocSATEncoder();
+       encodeAllSATEncoder(solver, satEncoder);
+       finishedClauses(satEncoder->satSolver);
+       int result= solve(satEncoder->satSolver);
+       model_print("sat_solver's result:%d\n", result);
+       //For now, let's just delete it, and in future for doing queries 
+       //we may need it.
+       deleteSATEncoder(satEncoder);
+}