resetting the solver

diff --git a/src/Backend/constraint.cc b/src/Backend/constraint.cc
index 84862828a9c72928cc565cf86d285de9571d0103..e867497635a41825982b5a611be557007e47c3df 100644 (file)
--- a/src/Backend/constraint.cc
+++ b/src/Backend/constraint.cc
@@ -86,13 +86,12 @@ void resetCNF(CNF *cnf){
        }
         clearVectorEdge(&cnf->constraints);
         clearVectorEdge(&cnf->args);
-        deleteIncrementalSolver(cnf->solver);
+        resetSolver(cnf->solver);
         memset(cnf->node_array, 0, sizeof(Node *) * cnf->capacity);
         
         cnf->varcount = 1;
         cnf->size = 0;
         cnf->enableMatching = true;
-        cnf->solver = allocIncrementalSolver();
         cnf->solveTime = 0;
        cnf->encodeTime = 0;
 }

diff --git a/src/Test/deserializersolvetest.cc b/src/Test/deserializersolvetest.cc
index 7a938cfb4d800013bbbb6b53ce8ca93bb2aef0e6..5498f8440539f6ca34cac76684097301da6a2e12 100755 (executable)
--- a/src/Test/deserializersolvetest.cc
+++ b/src/Test/deserializersolvetest.cc
@@ -1,11 +1,15 @@
 #include "csolver.h"
-
+//#include <unistd.h>
+//#include <sys/types.h>
 
 int main(int argc, char ** argv){
        if(argc < 2){
                printf("You should specify file names ...");
                exit(-1);       
        }
+//     printf("I am pid %d!\n", getpid());
+//        usleep(20000000);
+
        for(int i = 1; i < argc; i++) {
                CSolver* solver = CSolver::deserialize(argv[i]);
                int value=solver->solve();