retrieving back the addItem for mutableSet (needed for branchRecord)

diff --git a/src/csolver.cc b/src/csolver.cc
index ea4b92465f873dd8a59cb5fce07751512f6a5eb8..0eebb1759e8fde28ae529b403e853ad8e0f3202d 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -128,9 +128,9 @@ MutableSet *CSolver::createMutableSet(VarType type) {
        return set;
 }
 
        return set;
 }
 

-//void CSolver::addItem(MutableSet *set, uint64_t element) {
-//     set->addElementMSet(element);
-//}
+void CSolver::addItem(MutableSet *set, uint64_t element) {
+       set->addElementMSet(element);
+}

 
 uint64_t CSolver::createUniqueItem(MutableSet *set) {
        uint64_t element = set->getNewUniqueItem();
 
 uint64_t CSolver::createUniqueItem(MutableSet *set) {
        uint64_t element = set->getNewUniqueItem();

diff --git a/src/csolver.h b/src/csolver.h
index 480790832fbfea2d46875394e4bbe529e2e68e20..42a62160b8eaf59fd4e9c8df9cf82f1d932a2e87 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -27,7 +27,7 @@ public:
        /** This function adds a new item to a set. */
 
        //Deprecating this unless we need it...
        /** This function adds a new item to a set. */
 
        //Deprecating this unless we need it...

-       //      void addItem(MutableSet *set, uint64_t element);
+       void addItem(MutableSet *set, uint64_t element);

 
        /** This function adds a new unique item to the set and returns it.
            This function cannot be used in conjunction with manually adding
 
        /** This function adds a new unique item to the set and returns it.
            This function cannot be used in conjunction with manually adding

diff --git a/src/mymemory.h b/src/mymemory.h
index 7c63aa11c10edb99f259ab9a11fffcae8df89794..e0a60bd13294b871199b826e88c0ea13261c1b3d 100644 (file)
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -26,7 +26,7 @@
    void * ourrealloc(void *ptr, size_t size);
 */
 
    void * ourrealloc(void *ptr, size_t size);
 */
 

-#if 0
+#if 1

 void * model_malloc(size_t size);
 void model_free(void *ptr);
 void * model_calloc(size_t count, size_t size);
 void * model_malloc(size_t size);
 void model_free(void *ptr);
 void * model_calloc(size_t count, size_t size);