projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging with branch Master
[satune.git]
/
src
/
csolver.cc
diff --git
a/src/csolver.cc
b/src/csolver.cc
index 5ee5157d31f29246f3d6dddd0c7058947d217e6f..3d589b18f94da8668ecfc1233eef4c05ee3ee243 100644
(file)
--- a/
src/csolver.cc
+++ b/
src/csolver.cc
@@
-11,7
+11,7
@@
#include "sattranslator.h"
#include "tunable.h"
#include "polarityassignment.h"
#include "sattranslator.h"
#include "tunable.h"
#include "polarityassignment.h"
-#include "
analyz
er.h"
+#include "
transform
er.h"
#include "autotuner.h"
#include "astops.h"
#include "structs.h"
#include "autotuner.h"
#include "astops.h"
#include "structs.h"
@@
-24,6
+24,7
@@
CSolver::CSolver() :
elapsedTime(0)
{
satEncoder = new SATEncoder(this);
elapsedTime(0)
{
satEncoder = new SATEncoder(this);
+ transformer = new Transformer(this);
}
/** This function tears down the solver and the entire AST */
}
/** This function tears down the solver and the entire AST */
@@
-67,6
+68,7
@@
CSolver::~CSolver() {
delete boolTrue;
delete boolFalse;
delete satEncoder;
delete boolTrue;
delete boolFalse;
delete satEncoder;
+ delete transformer;
}
CSolver *CSolver::clone() {
}
CSolver *CSolver::clone() {
@@
-357,7
+359,7
@@
int CSolver::startEncoding() {
long long startTime = getTimeNano();
computePolarities(this);
long long startTime = getTimeNano();
computePolarities(this);
-
orderAnalysis(this
);
+
transformer->orderAnalysis(
);
naiveEncodingDecision(this);
satEncoder->encodeAllSATEncoder(this);
int result = unsat ? IS_UNSAT : satEncoder->solve();
naiveEncodingDecision(this);
satEncoder->encodeAllSATEncoder(this);
int result = unsat ? IS_UNSAT : satEncoder->solve();