From: bdemsky <bdemsky@uci.edu>
Date: Fri, 8 Sep 2017 00:03:41 +0000 (-0700)
Subject: Simplify Code
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee69b0984366edd899227cc651ec272c8f77c66a;p=satune.git

Simplify Code
---

diff --git a/src/ASTTransform/preprocess.cc b/src/ASTTransform/preprocess.cc
index 00d324e..a23d918 100644
--- a/src/ASTTransform/preprocess.cc
+++ b/src/ASTTransform/preprocess.cc
@@ -2,6 +2,7 @@
 #include "boolean.h"
 #include "csolver.h"
 #include "tunable.h"
+#include "iterator.h"
 
 Preprocess::Preprocess(CSolver *_solver)
         : Transform(_solver)
@@ -15,13 +16,12 @@ void Preprocess::doTransform() {
 	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();
 }
 
@@ -38,29 +38,9 @@ void Preprocess::resolveBooleanVars() {
 	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::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 3aa3749..1272266 100644
--- a/src/ASTTransform/preprocess.h
+++ b/src/ASTTransform/preprocess.h
@@ -11,11 +11,8 @@ class Preprocess : public Transform {
 
         CMEMALLOC;
 private:
-				HashsetBoolean processed;
 				HashsetBoolean toremove;
-				void transformBoolean(Boolean *b);
 				void processBooleanVar(BooleanVar * b);
-				void processLogicOp(BooleanLogic * b);
 				void resolveBooleanVars();
 };