From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Mon, 23 Oct 2017 22:02:49 +0000 (-0700)
Subject: After resolving conflicts ..
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=747484c9f7ce17d58e4084730c0683f392b19dee

After resolving conflicts ..
---

747484c9f7ce17d58e4084730c0683f392b19dee
diff --cc src/csolver.cc
index 5b8f4ca,be4a3a8..d316724
--- a/src/csolver.cc
+++ b/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);