Merge branch 'hamed' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler into...

diff --git a/.gitignore b/.gitignore
index 480418d5f2ce5faa1e6aa26b140301b08b9faaff..64236e112aa9cde40ed748ba987a2f2a08d0ada3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 #Ignoring netbeans configs
 nbproject/
-sat_solver
+sat_solver*
 setup.sh
 
 #Ignoring binary files

diff --git a/deploy-cs.sh b/deploy-cs.sh
new file mode 100755 (executable)
index 0000000..3e3dcc7
--- /dev/null
+++ b/deploy-cs.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+#Terminate the script if even one command fails
+set -e
+
+BASE=../
+SERVERS="dc-8.calit2.uci.edu dc-9.calit2.uci.edu dc-10.calit2.uci.edu dc-11.calit2.uci.edu"
+REMOTEDIR="/scratch/hamed/"
+INFILE="constraint_compiler/"
+SRC="constraint_compiler/src/"
+OUTFILE=csolver.tar.gz
+USER=hamed
+
+cd $BASE
+
+rm -f $OUTFILE
+tar -czvf $OUTFILE $INFILE
+
+for SERVER in $SERVERS; do
+       scp $OUTFILE "$USER@$SERVER:$REMOTEDIR"
+       ssh $USER@$SERVER "cd $REMOTEDIR; sudo rm -r $SRC; tar -xzvf $OUTFILE; cd $SRC; make clean; ./setup.sh"
+done

diff --git a/src/ASTTransform/elementopt.cc b/src/ASTTransform/elementopt.cc
index d6dec3dc706d13321a61967f78ba2d2728433569..3f1f8928f9d674be7c002a9954035f028dab4492 100755 (executable)
--- a/src/ASTTransform/elementopt.cc
+++ b/src/ASTTransform/elementopt.cc
@@ -98,7 +98,7 @@ void ElementOpt::handlePredicateInequality(BooleanPredicate *pred, ElementSet *v
        case SATC_LT: {
                for(uint i=0; i<size; i++) {
                        uint64_t val = s->getElement(i);
-                       if (val >= cvalue)
+                       if (val < cvalue)
                                elemArray[count++] = val;
                }
                break;
@@ -106,7 +106,7 @@ void ElementOpt::handlePredicateInequality(BooleanPredicate *pred, ElementSet *v
        case SATC_GT: {
                for(uint i=0; i<size; i++) {
                        uint64_t val = s->getElement(i);
-                       if (val <= cvalue)
+                       if (val > cvalue)
                                elemArray[count++] = val;
                }
                break;
@@ -114,7 +114,7 @@ void ElementOpt::handlePredicateInequality(BooleanPredicate *pred, ElementSet *v
        case SATC_LTE: {
                for(uint i=0; i<size; i++) {
                        uint64_t val = s->getElement(i);
-                       if (val > cvalue)
+                       if (val <= cvalue)
                                elemArray[count++] = val;
                }
                break;
@@ -122,7 +122,7 @@ void ElementOpt::handlePredicateInequality(BooleanPredicate *pred, ElementSet *v
        case SATC_GTE: {
                for(uint i=0; i<size; i++) {
                        uint64_t val = s->getElement(i);
-                       if (val < cvalue)
+                       if (val >= cvalue)
                                elemArray[count++] = val;
                }
                break;

diff --git a/src/Test/ccsolvertest.c b/src/Test/ccsolvertest.c
index ab2c1abb394a5595d9e4e6918ac0081eba977f60..41f2f2d337ffe1bdaaef6b53925247d430b3d80d 100644 (file)
--- a/src/Test/ccsolvertest.c
+++ b/src/Test/ccsolvertest.c
@@ -20,5 +20,6 @@ int main (int num, char** args){
         else
                 printf("UNSAT\n");
         deleteCCSolver(solver);
+       return 0;
 }
 

diff --git a/src/Translator/sattranslator.cc b/src/Translator/sattranslator.cc
index 1e955969554bb8b76c2b0c76f008cb23711fb231..8e2fcf16db1c719f90da7d0da377dd2739c63332 100644 (file)
--- a/src/Translator/sattranslator.cc
+++ b/src/Translator/sattranslator.cc
@@ -52,15 +52,12 @@ uint64_t getElementValueOneHotSATTranslator(CSolver *This, ElementEncoding *elem
 
 uint64_t getElementValueUnarySATTranslator(CSolver *This, ElementEncoding *elemEnc) {
        uint i;
-       bool overflow = true;
        for (i = 0; i < elemEnc->numVars; i++) {
                if (!getValueSolver(This->getSATEncoder()->getCNF()->solver, getEdgeVar( elemEnc->variables[i] )) ) {
-                       overflow = false;
                        break;
                }
        }
-       if(overflow)
-               model_print("WARNING: Element has undefined value!\n");
+
        return elemEnc->encodingArray[i];
 }
 

diff --git a/src/ccsolver.cc b/src/ccsolver.cc
index 25e176172cd7abfcb1d86af445805b84e4dbe4bf..1c4548038f37cc1e814d06757c01c3ff4889cc5e 100644 (file)
--- a/src/ccsolver.cc
+++ b/src/ccsolver.cc
@@ -144,3 +144,7 @@ void serialize(void* solver){
 void mustHaveValue(void *solver, void *element){
        CCSOLVER(solver)->mustHaveValue( (Element*) element);
 }
+
+void* clone(void * solver){
+       return CCSOLVER(solver)->clone();
+}
\ No newline at end of file

diff --git a/src/ccsolver.h b/src/ccsolver.h
index f98dbf266a257033b98d669c3c1fecec7cdf80c0..a17bd1cfd1c9601e379245d747e705baf441b77a 100644 (file)
--- a/src/ccsolver.h
+++ b/src/ccsolver.h
@@ -41,6 +41,7 @@ int getOrderConstraintValue(void* solver,void *order, long first, long second);
 void printConstraints(void* solver);
 void serialize(void* solver);
 void mustHaveValue(void *solver, void *element);
+void* clone(void * solver);
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/csolver.cc b/src/csolver.cc
index 3eabf2e8648de534d07330beae7a0c9d7b6a3554..44b29bbad3845ec86009f64a17b6b714f114b7e5 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -251,6 +251,7 @@ Element *CSolver::getElementConst(VarType type, uint64_t value) {
 
 
 Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, BooleanEdge overflowstatus) {
+       ASSERT(numArrays == 2);
        Element *element = new ElementFunction(function,array,numArrays,overflowstatus);
        Element *e = elemMap.get(element);
        if (e == NULL) {

diff --git a/src/pycsolver.py b/src/pycsolver.py
index ba49d77b296ba1ebe22f23ac25f8f09ea23d725b..b0e43a97bd3b4d50cff93bde4dfeb4b62ccc905e 100644 (file)
--- a/src/pycsolver.py
+++ b/src/pycsolver.py
@@ -109,6 +109,8 @@ def loadCSolver():
        csolverlb.getOrderConstraintValue.restype = c_int
        csolverlb.printConstraints.argtypes = [c_void_p]
        csolverlb.printConstraints.restype = None
+        csolverlb.clone.argtypes = [c_void_p]
+       csolverlb.clone.restype = c_void_p
        csolverlb.serialize.argtypes = [c_void_p]
        csolverlb.serialize.restype = None
        return csolverlb