X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.cc;h=d0aa32ea175c04b0381df87ee41ed9e20f4135bd;hp=29a99118eda43b1e26b6553afb11164d9ca2ea08;hb=7fb0eb9a3dcf843f413d858e1cf66e9e13de200f;hpb=a255c76241d54ef340c21c25a8c640e88988d204

diff --git a/src/csolver.cc b/src/csolver.cc
index 29a9911..d0aa32e 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() {
@@ -375,7 +377,7 @@ int CSolver::solve() {
 		
 	long long startTime = getTimeNano();
 	computePolarities(this);
-	orderAnalysis(this);
+	transformer->orderAnalysis();
 	naiveEncodingDecision(this);
 	satEncoder->encodeAllSATEncoder(this);
 	int result = unsat ? IS_UNSAT : satEncoder->solve();