memoize timeouts

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

diff --git a/src/AST/mutableset.cc b/src/AST/mutableset.cc
index d029f82bbdcdf428ebf5fe1c5f9c1eb342fc8d46..31ce431cffb0af3eb207957564a2cf5e3b0f5026 100644 (file)
--- a/src/AST/mutableset.cc
+++ b/src/AST/mutableset.cc
@@ -1,5 +1,6 @@
 #include "mutableset.h"
 #include "csolver.h"
+#include "qsort.h"
 
 MutableSet::MutableSet(VarType t) : Set(t) {
 }
@@ -8,14 +9,20 @@ void MutableSet::addElementMSet(uint64_t element) {
        members->push(element);
 }
 
-Set * MutableSet::clone(CSolver * solver, CloneMap *map) {
-       Set * s=map->set.get(this);
+Set *MutableSet::clone(CSolver *solver, CloneMap *map) {
+       Set *s = (Set *) map->get(this);
        if (s != NULL)
                return s;
-       s=solver->createMutableSet(type);
-       for(uint i=0; i<members->getSize();i++) {
+       s = solver->createMutableSet(type);
+       for (uint i = 0; i < members->getSize(); i++) {
+               ((MutableSet *)s)->addElementMSet(members->get(i));
                solver->addItem((MutableSet *) s, members->get(i));
        }
-       map->set.put(this, s);
+       ((MutableSet *)s)->finalize();
+       map->put(this, s);
        return s;
 }
+
+void MutableSet::finalize() {
+       bsdqsort(members->expose(), members->getSize(), sizeof(uint64_t), intcompare);
+}
\ No newline at end of file