Bug fix

[satune.git] / src / AST / boolean.cc

diff --git a/src/AST/boolean.cc b/src/AST/boolean.cc
index 46e277a390a5ec8ca35ab5fec34147d775e25af8..e63549ee409b07e0555675187dda6baaa3e8601b 100644 (file)
--- a/src/AST/boolean.cc
+++ b/src/AST/boolean.cc
@@ -5,11 +5,13 @@
 #include "order.h"
 #include "predicate.h"
 
+uint64_t Boolean::counter = 0;
+
 Boolean::Boolean(ASTNodeType _type) :
        ASTNode(_type),
        polarity(P_UNDEFINED),
        boolVal(BV_UNDEFINED),
-       parents() {
+       parents(), id(counter++) {
 }
 
 BooleanConst::BooleanConst(bool _isTrue) :
@@ -71,32 +73,19 @@ Boolean *BooleanVar::clone(CSolver *solver, CloneMap *map) {
 }
 
 Boolean *BooleanOrder::clone(CSolver *solver, CloneMap *map) {
-        Boolean *b = (Boolean *) map->get(this);
-       if (b != NULL)
-               return b;
        Order *ordercopy = order->clone(solver, map);
-       b= solver->orderConstraint(ordercopy, first, second).getRaw();
-        map->put(this, b);
-        return b;
+       return solver->orderConstraint(ordercopy, first, second).getRaw();
 }
 
 Boolean *BooleanLogic::clone(CSolver *solver, CloneMap *map) {
-        Boolean *b = (Boolean *) map->get(this);
-       if (b != NULL)
-               return b;
        BooleanEdge array[inputs.getSize()];
        for (uint i = 0; i < inputs.getSize(); i++) {
                array[i] = cloneEdge(solver, map, inputs.get(i));
        }
-       b= solver->applyLogicalOperation(op, array, inputs.getSize()).getRaw();
-        map->put(this, b);
-        return b;
+       return solver->applyLogicalOperation(op, array, inputs.getSize()).getRaw();
 }
 
 Boolean *BooleanPredicate::clone(CSolver *solver, CloneMap *map) {
-        Boolean *b = (Boolean *) map->get(this);
-       if (b != NULL)
-               return b;
        Element *array[inputs.getSize()];
        for (uint i = 0; i < inputs.getSize(); i++) {
                array[i] = inputs.get(i)->clone(solver, map);
@@ -104,9 +93,7 @@ Boolean *BooleanPredicate::clone(CSolver *solver, CloneMap *map) {
        Predicate *pred = predicate->clone(solver, map);
        BooleanEdge defstatus = undefStatus ? cloneEdge(solver, map, undefStatus) : BooleanEdge();
 
-       b= solver->applyPredicateTable(pred, array, inputs.getSize(), defstatus).getRaw();
-        map->put(this, b);
-        return b;
+       return solver->applyPredicateTable(pred, array, inputs.getSize(), defstatus).getRaw();
 }
 
 void BooleanPredicate::updateParents() {
@@ -129,6 +116,16 @@ void BooleanVar::serialize(Serializer *serializer) {
        serializer->mywrite(&vtype, sizeof(VarType));
 }
 
+void BooleanConst::serialize(Serializer *serializer) {
+       if (serializer->isSerialized(this))
+               return;
+       serializer->addObject(this);
+       serializer->mywrite(&type, sizeof(ASTNodeType));
+       BooleanConst *This = this;
+       serializer->mywrite(&This, sizeof(BooleanConst *));
+       serializer->mywrite(&istrue, sizeof(bool));
+}
+
 void BooleanVar::print() {
        model_print("BooleanVar<%p>\n", this);
 }