Simplify Code

diff --git a/src/ASTTransform/preprocess.cc b/src/ASTTransform/preprocess.cc
index 00d324e9e3e21b2c10ce041acdba3afc4e2af242..a23d918e600833b534187f84f08fc60d1ac1201d 100644 (file)
--- a/src/ASTTransform/preprocess.cc
+++ b/src/ASTTransform/preprocess.cc
@@ -2,6 +2,7 @@
 #include "boolean.h"
 #include "csolver.h"
 #include "tunable.h"
 #include "boolean.h"
 #include "csolver.h"
 #include "tunable.h"

+#include "iterator.h"

 
 Preprocess::Preprocess(CSolver *_solver)
         : Transform(_solver)
 
 Preprocess::Preprocess(CSolver *_solver)
         : Transform(_solver)


@@ -15,13 +16,12 @@ void Preprocess::doTransform() {
        if (solver->getTuner()->getTunable(PREPROCESS, &onoff) == 0)
                return;
        
        if (solver->getTuner()->getTunable(PREPROCESS, &onoff) == 0)
                return;
        

-       SetIteratorBooleanEdge *iterator = solver->getConstraints();
-       while (iterator->hasNext()) {
-               BooleanEdge boolean = iterator->next();
-               Boolean *b = boolean.getBoolean();
-               transformBoolean(b);
+       BooleanIterator bit(solver);
+       while(bit.hasNext()) {
+               Boolean *b=bit.next();
+               if (b->type == BOOLEANVAR)
+                       processBooleanVar((BooleanVar *)b);

        }
        }

-       delete iterator;

        resolveBooleanVars();
 }
 
        resolveBooleanVars();
 }
 


@@ -38,29 +38,9 @@ void Preprocess::resolveBooleanVars() {
        delete iterator;
 }
 
        delete iterator;
 }
 

-void Preprocess::transformBoolean(Boolean *b) {
-       if (!processed.add(b))
-               return;
-       switch (b->type) {
-       case BOOLEANVAR:
-               processBooleanVar((BooleanVar *)b);
-               break;
-       case LOGICOP:
-               processLogicOp((BooleanLogic *)b);
-               break;
-       default:
-               break;
-       }
-}
-

 void Preprocess::processBooleanVar(BooleanVar * b) {
        if (b->polarity==P_TRUE ||
                        b->polarity==P_FALSE) {
                toremove.add(b);
        }
 }
 void Preprocess::processBooleanVar(BooleanVar * b) {
        if (b->polarity==P_TRUE ||
                        b->polarity==P_FALSE) {
                toremove.add(b);
        }
 }

-
-void Preprocess::processLogicOp(BooleanLogic * b) {
-       for(uint i=0; i < b->inputs.getSize(); i++)
-               transformBoolean(b->inputs.get(i).getBoolean());
-}

diff --git a/src/ASTTransform/preprocess.h b/src/ASTTransform/preprocess.h
index 3aa37499aa0df725629cf783c43e2db9c65bbacd..1272266b6da26a4193221b85ecaa4ae2cc2f616f 100644 (file)
--- a/src/ASTTransform/preprocess.h
+++ b/src/ASTTransform/preprocess.h
@@ -11,11 +11,8 @@ class Preprocess : public Transform {
 
         CMEMALLOC;
 private:
 
         CMEMALLOC;
 private:

-                               HashsetBoolean processed;

                                HashsetBoolean toremove;
                                HashsetBoolean toremove;

-                               void transformBoolean(Boolean *b);

                                void processBooleanVar(BooleanVar * b);
                                void processBooleanVar(BooleanVar * b);

-                               void processLogicOp(BooleanLogic * b);

                                void resolveBooleanVars();
 };
 
                                void resolveBooleanVars();
 };