Switch hashtable/hashset

[satune.git] / src / Backend / satencoder.cc

diff --git a/src/Backend/satencoder.cc b/src/Backend/satencoder.cc
index b95e0b1c5217982c2d90f233e69aac547e7dc4f5..4b3189f834d6cc6d705ce4f37e14400618016642 100644 (file)
--- a/src/Backend/satencoder.cc
+++ b/src/Backend/satencoder.cc
@@ -29,15 +29,15 @@ void deleteSATEncoder(SATEncoder *This) {
 }
 
 void encodeAllSATEncoder(CSolver *csolver, SATEncoder *This) {
-       HSIteratorBoolean *iterator=iteratorBoolean(csolver->constraints);
-       while(hasNextBoolean(iterator)) {
-               Boolean *constraint = nextBoolean(iterator);
+       HSIteratorBoolean *iterator=csolver->constraints.iterator();
+       while(iterator->hasNext()) {
+               Boolean *constraint = iterator->next();
                model_print("Encoding All ...\n\n");
                Edge c = encodeConstraintSATEncoder(This, constraint);
                model_print("Returned Constraint in EncodingAll:\n");
                addConstraintCNF(This->cnf, c);
        }
-       deleteIterBoolean(iterator);
+       delete iterator;
 }
 
 Edge encodeConstraintSATEncoder(SATEncoder *This, Boolean *constraint) {