X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.cc;h=3d589b18f94da8668ecfc1233eef4c05ee3ee243;hp=5ee5157d31f29246f3d6dddd0c7058947d217e6f;hb=87e67ce60ad79d235655d7c74276ba27d1d98632;hpb=83849cbb24f9680d1ca7c09d09ecefc6fe461d66

diff --git a/src/csolver.cc b/src/csolver.cc
index 5ee5157..3d589b1 100644
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -11,7 +11,7 @@
 #include "sattranslator.h"
 #include "tunable.h"
 #include "polarityassignment.h"
-#include "analyzer.h"
+#include "transformer.h"
 #include "autotuner.h"
 #include "astops.h"
 #include "structs.h"
@@ -24,6 +24,7 @@ CSolver::CSolver() :
 	elapsedTime(0)
 {
 	satEncoder = new SATEncoder(this);
+	transformer = new Transformer(this);
 }
 
 /** This function tears down the solver and the entire AST */
@@ -67,6 +68,7 @@ CSolver::~CSolver() {
 	delete boolTrue;
 	delete boolFalse;
 	delete satEncoder;
+	delete transformer;
 }
 
 CSolver *CSolver::clone() {
@@ -357,7 +359,7 @@ int CSolver::startEncoding() {
 		
 	long long startTime = getTimeNano();
 	computePolarities(this);
-	orderAnalysis(this);
+	transformer->orderAnalysis();
 	naiveEncodingDecision(this);
 	satEncoder->encodeAllSATEncoder(this);
 	int result = unsat ? IS_UNSAT : satEncoder->solve();