Adding decomposeOrderTransform to transformer

[satune.git] / src / ASTTransform / transformer.cc

diff --git a/src/ASTTransform/transformer.cc b/src/ASTTransform/transformer.cc
index b22b87d6c2abe20ccec957e7b1cbf48a844fa6f3..54dad59ebe14ef5b89635bd56a65fdfa590ea2c9 100644 (file)
--- a/src/ASTTransform/transformer.cc
+++ b/src/ASTTransform/transformer.cc
@@ -18,12 +18,14 @@
 
 Transformer::Transformer(CSolver *_solver):
        integerEncoding(new IntegerEncodingTransform(_solver)),
+       decomposeOrder(new DecomposeOrderTransform(_solver)),
        solver(_solver)
 {
 }
 
 Transformer::~Transformer(){
        delete integerEncoding;
+       delete decomposeOrder;
 }
 
 void Transformer::orderAnalysis() {
@@ -31,9 +33,8 @@ void Transformer::orderAnalysis() {
        uint size = orders->getSize();
        for (uint i = 0; i < size; i++) {
                Order *order = orders->get(i);
-               DecomposeOrderTransform* decompose = new DecomposeOrderTransform(solver, order);
-               if (!decompose->canExecuteTransform()){
-                       delete decompose;
+               decomposeOrder->setCurrentOrder(order);
+               if (!decomposeOrder->canExecuteTransform()){
                        continue;
                }
 
@@ -69,9 +70,8 @@ void Transformer::orderAnalysis() {
 
                //This is needed for splitorder
                computeStronglyConnectedComponentGraph(graph);
-               decompose->setOrderGraph(graph);
-               decompose->doTransform();
-               delete decompose;
+               decomposeOrder->setOrderGraph(graph);
+               decomposeOrder->doTransform();
                delete graph;
 
                integerEncoding->setCurrentOrder(order);