After resolving conflicts ..
authorHamed Gorjiara <hgorjiar@uci.edu>
Mon, 23 Oct 2017 22:02:49 +0000 (15:02 -0700)
committerHamed Gorjiara <hgorjiar@uci.edu>
Mon, 23 Oct 2017 22:02:49 +0000 (15:02 -0700)
1  2 
src/csolver.cc
src/csolver.h

diff --cc src/csolver.cc
@@@ -456,13 -473,13 +479,13 @@@ int CSolver::solve() 
        DecomposeOrderTransform dot(this);
        dot.doTransform();
  
-       IntegerEncodingTransform iet(this);
-       iet.doTransform();
+       //IntegerEncodingTransform iet(this);
+       //iet.doTransform();
  
 -      //EncodingGraph eg(this);
 -      //eg.buildGraph();
 -      //eg.encode();
 -      //printConstraints();
 +      EncodingGraph eg(this);
 +      eg.buildGraph();
 +      eg.encode();
 +//    printConstraints();
        naiveEncodingDecision(this);
        satEncoder->encodeAllSATEncoder(this);
        model_print("Is problem UNSAT after encoding: %d\n", unsat);
diff --cc src/csolver.h
Simple merge