Renaming

diff --git a/src/AST/table.cc b/src/AST/table.cc
index c4e95941a2fbd66e4a56ebe52a77b607ba34c1bd..4d0716eb00b94def7db28c2794b6f1cc8e720503 100644 (file)
--- a/src/AST/table.cc
+++ b/src/AST/table.cc
@@ -39,7 +39,7 @@ Table *Table::clone(CSolver *solver, CloneMap *map) {
        }
        Set *rcopy = range != NULL ? range->clone(solver, map) : NULL;
        t = solver->createTable(array, domains.getSize(), rcopy);
-       HSIteratorTableEntry *entryit = entries->iterator();
+       SetIteratorTableEntry *entryit = entries->iterator();
        while (entryit->hasNext()) {
                TableEntry *te = entryit->next();
                solver->addTableEntry(t, &te->inputs[0], te->inputSize, te->output);
@@ -50,7 +50,7 @@ Table *Table::clone(CSolver *solver, CloneMap *map) {
 }
 
 Table::~Table() {
-       HSIteratorTableEntry *iterator = entries->iterator();
+       SetIteratorTableEntry *iterator = entries->iterator();
        while (iterator->hasNext()) {
                deleteTableEntry(iterator->next());
        }

diff --git a/src/ASTAnalyses/orderanalysis.cc b/src/ASTAnalyses/orderanalysis.cc
index 60103759b0bfc61b5d060c412312c57cf3011b0f..56544f4c8983374845e9c44dbcde06a80efa0a2c 100644 (file)
--- a/src/ASTAnalyses/orderanalysis.cc
+++ b/src/ASTAnalyses/orderanalysis.cc
@@ -10,7 +10,7 @@
 #include "tunable.h"
 
 void DFS(OrderGraph *graph, Vector<OrderNode *> *finishNodes) {
-       HSIteratorOrderNode *iterator = graph->getNodes();
+       SetIteratorOrderNode *iterator = graph->getNodes();
        while (iterator->hasNext()) {
                OrderNode *node = iterator->next();
                if (node->status == NOTVISITED) {
@@ -39,7 +39,7 @@ void DFSReverse(OrderGraph *graph, Vector<OrderNode *> *finishNodes) {
 }
 
 void DFSNodeVisit(OrderNode *node, Vector<OrderNode *> *finishNodes, bool isReverse, bool mustvisit, uint sccNum) {
-       HSIteratorOrderEdge *iterator = isReverse ? node->inEdges.iterator() : node->outEdges.iterator();
+       SetIteratorOrderEdge *iterator = isReverse ? node->inEdges.iterator() : node->outEdges.iterator();
        while (iterator->hasNext()) {
                OrderEdge *edge = iterator->next();
                if (mustvisit) {
@@ -65,7 +65,7 @@ void DFSNodeVisit(OrderNode *node, Vector<OrderNode *> *finishNodes, bool isReve
 }
 
 void resetNodeInfoStatusSCC(OrderGraph *graph) {
-       HSIteratorOrderNode *iterator = graph->getNodes();
+       SetIteratorOrderNode *iterator = graph->getNodes();
        while (iterator->hasNext()) {
                iterator->next()->status = NOTVISITED;
        }
@@ -81,7 +81,7 @@ void computeStronglyConnectedComponentGraph(OrderGraph *graph) {
 }
 
 bool isMustBeTrueNode(OrderNode *node) {
-       HSIteratorOrderEdge *iterator = node->inEdges.iterator();
+       SetIteratorOrderEdge *iterator = node->inEdges.iterator();
        while (iterator->hasNext()) {
                OrderEdge *edge = iterator->next();
                if (!edge->mustPos) {
@@ -103,12 +103,12 @@ bool isMustBeTrueNode(OrderNode *node) {
 }
 
 void bypassMustBeTrueNode(CSolver *This, OrderGraph *graph, OrderNode *node) {
-       HSIteratorOrderEdge *iterin = node->inEdges.iterator();
+       SetIteratorOrderEdge *iterin = node->inEdges.iterator();
        while (iterin->hasNext()) {
                OrderEdge *inEdge = iterin->next();
                OrderNode *srcNode = inEdge->source;
                srcNode->outEdges.remove(inEdge);
-               HSIteratorOrderEdge *iterout = node->outEdges.iterator();
+               SetIteratorOrderEdge *iterout = node->outEdges.iterator();
                while (iterout->hasNext()) {
                        OrderEdge *outEdge = iterout->next();
                        OrderNode *sinkNode = outEdge->sink;
@@ -128,7 +128,7 @@ void bypassMustBeTrueNode(CSolver *This, OrderGraph *graph, OrderNode *node) {
 }
 
 void removeMustBeTrueNodes(CSolver *This, OrderGraph *graph) {
-       HSIteratorOrderNode *iterator = graph->getNodes();
+       SetIteratorOrderNode *iterator = graph->getNodes();
        while (iterator->hasNext()) {
                OrderNode *node = iterator->next();
                if (isMustBeTrueNode(node)) {
@@ -172,7 +172,7 @@ void completePartialOrderGraph(OrderGraph *graph) {
                        for (uint j = 0; j < rSize; j++) {
                                OrderNode *rnode = sccNodes.get(j);
                                //Compute source sets
-                               HSIteratorOrderEdge *iterator = rnode->inEdges.iterator();
+                               SetIteratorOrderEdge *iterator = rnode->inEdges.iterator();
                                while (iterator->hasNext()) {
                                        OrderEdge *edge = iterator->next();
                                        OrderNode *parent = edge->source;
@@ -191,7 +191,7 @@ void completePartialOrderGraph(OrderGraph *graph) {
                                table->put(rnode, set);
 
                                //Use source sets to compute pseudoPos edges
-                               HSIteratorOrderEdge *iterator = node->inEdges.iterator();
+                               SetIteratorOrderEdge *iterator = node->inEdges.iterator();
                                while (iterator->hasNext()) {
                                        OrderEdge *edge = iterator->next();
                                        OrderNode *parent = edge->source;
@@ -215,7 +215,7 @@ void completePartialOrderGraph(OrderGraph *graph) {
 }
 
 void DFSMust(OrderGraph *graph, Vector<OrderNode *> *finishNodes) {
-       HSIteratorOrderNode *iterator = graph->getNodes();
+       SetIteratorOrderNode *iterator = graph->getNodes();
        while (iterator->hasNext()) {
                OrderNode *node = iterator->next();
                if (node->status == NOTVISITED) {
@@ -239,7 +239,7 @@ void DFSClearContradictions(CSolver *solver, OrderGraph *graph, Vector<OrderNode
 
                {
                        //Compute source sets
-                       HSIteratorOrderEdge *iterator = node->inEdges.iterator();
+                       SetIteratorOrderEdge *iterator = node->inEdges.iterator();
                        while (iterator->hasNext()) {
                                OrderEdge *edge = iterator->next();
                                OrderNode *parent = edge->source;
@@ -253,7 +253,7 @@ void DFSClearContradictions(CSolver *solver, OrderGraph *graph, Vector<OrderNode
                }
                if (computeTransitiveClosure) {
                        //Compute full transitive closure for nodes
-                       HSIteratorOrderNode *srciterator = sources->iterator();
+                       SetIteratorOrderNode *srciterator = sources->iterator();
                        while (srciterator->hasNext()) {
                                OrderNode *srcnode = srciterator->next();
                                OrderEdge *newedge = graph->getOrderEdgeFromOrderGraph(srcnode, node);
@@ -268,7 +268,7 @@ void DFSClearContradictions(CSolver *solver, OrderGraph *graph, Vector<OrderNode
                }
                {
                        //Use source sets to compute mustPos edges
-                       HSIteratorOrderEdge *iterator = node->inEdges.iterator();
+                       SetIteratorOrderEdge *iterator = node->inEdges.iterator();
                        while (iterator->hasNext()) {
                                OrderEdge *edge = iterator->next();
                                OrderNode *parent = edge->source;
@@ -283,7 +283,7 @@ void DFSClearContradictions(CSolver *solver, OrderGraph *graph, Vector<OrderNode
                }
                {
                        //Use source sets to compute mustNeg for edges that would introduce cycle if true
-                       HSIteratorOrderEdge *iterator = node->outEdges.iterator();
+                       SetIteratorOrderEdge *iterator = node->outEdges.iterator();
                        while (iterator->hasNext()) {
                                OrderEdge *edge = iterator->next();
                                OrderNode *child = edge->sink;
@@ -322,7 +322,7 @@ void reachMustAnalysis(CSolver *solver, OrderGraph *graph, bool computeTransitiv
    had one). */
 
 void localMustAnalysisTotal(CSolver *solver, OrderGraph *graph) {
-       HSIteratorOrderEdge *iterator = graph->getEdges();
+       SetIteratorOrderEdge *iterator = graph->getEdges();
        while (iterator->hasNext()) {
                OrderEdge *edge = iterator->next();
                if (edge->mustPos) {
@@ -347,7 +347,7 @@ void localMustAnalysisTotal(CSolver *solver, OrderGraph *graph) {
     polarity. */
 
 void localMustAnalysisPartial(CSolver *solver, OrderGraph *graph) {
-       HSIteratorOrderEdge *iterator = graph->getEdges();
+       SetIteratorOrderEdge *iterator = graph->getEdges();
        while (iterator->hasNext()) {
                OrderEdge *edge = iterator->next();
                if (edge->mustPos) {

diff --git a/src/ASTAnalyses/ordergraph.cc b/src/ASTAnalyses/ordergraph.cc
index 9f53d1134fb3a42256f7aed05017edda007a539a..c0df7a54d87196e67f5011fe8ab40e1f25aad2a9 100644 (file)
--- a/src/ASTAnalyses/ordergraph.cc
+++ b/src/ASTAnalyses/ordergraph.cc
@@ -159,14 +159,14 @@ void OrderGraph::addMustOrderConstraintToOrderGraph(BooleanOrder *bOrder) {
 }
 
 OrderGraph::~OrderGraph() {
-       HSIteratorOrderNode *iterator = nodes->iterator();
+       SetIteratorOrderNode *iterator = nodes->iterator();
        while (iterator->hasNext()) {
                OrderNode *node = iterator->next();
                delete node;
        }
        delete iterator;
 
-       HSIteratorOrderEdge *eiterator = edges->iterator();
+       SetIteratorOrderEdge *eiterator = edges->iterator();
        while (eiterator->hasNext()) {
                OrderEdge *edge = eiterator->next();
                delete edge;

diff --git a/src/ASTAnalyses/ordergraph.h b/src/ASTAnalyses/ordergraph.h
index f80ec98ba026e68eb2dcb8392327753b0d8b8713..d28c4b699582a69179f768d00f83505d1280c473 100644 (file)
--- a/src/ASTAnalyses/ordergraph.h
+++ b/src/ASTAnalyses/ordergraph.h
@@ -25,8 +25,8 @@ public:
        void addMustOrderEdge(OrderNode *node1, OrderNode *node2, BooleanOrder *constr);
        OrderEdge *getInverseOrderEdge(OrderEdge *edge);
        Order *getOrder() {return order;}
-       HSIteratorOrderNode *getNodes() {return nodes->iterator();}
-       HSIteratorOrderEdge *getEdges() {return edges->iterator();}
+       SetIteratorOrderNode *getNodes() {return nodes->iterator();}
+       SetIteratorOrderEdge *getEdges() {return edges->iterator();}
 
        CMEMALLOC;
 private:

diff --git a/src/ASTAnalyses/polarityassignment.cc b/src/ASTAnalyses/polarityassignment.cc
index f0dac379af4dbb999370f5a35dd0099970393956..38f32aebbcf2bde972bb019e7cb2f10dfb836c1c 100644 (file)
--- a/src/ASTAnalyses/polarityassignment.cc
+++ b/src/ASTAnalyses/polarityassignment.cc
@@ -2,7 +2,7 @@
 #include "csolver.h"
 
 void computePolarities(CSolver *This) {
-       HSIteratorBoolean *iterator = This->getConstraints();
+       SetIteratorBoolean *iterator = This->getConstraints();
        while (iterator->hasNext()) {
                Boolean *boolean = iterator->next();
                updatePolarity(boolean, P_TRUE);

diff --git a/src/Backend/satencoder.cc b/src/Backend/satencoder.cc
index dcd70bcc1a37b6c47741efb3eb6f154fc1a0f001..e053d78514f0b3d2b33868837aa2bd5ca97fb1c0 100644 (file)
--- a/src/Backend/satencoder.cc
+++ b/src/Backend/satencoder.cc
@@ -26,7 +26,7 @@ int SATEncoder::solve() {
 }
 
 void SATEncoder::encodeAllSATEncoder(CSolver *csolver) {
-       HSIteratorBoolean *iterator = csolver->getConstraints();
+       SetIteratorBoolean *iterator = csolver->getConstraints();
        while (iterator->hasNext()) {
                Boolean *constraint = iterator->next();
                Edge c = encodeConstraintSATEncoder(constraint);

diff --git a/src/Backend/satfunctableencoder.cc b/src/Backend/satfunctableencoder.cc
index 15094ee31ea0dd07e4b68dcc5d30be8a78e25a30..0ec498afea604ad82c97f3cf5b3563bcaac2f112 100644 (file)
--- a/src/Backend/satfunctableencoder.cc
+++ b/src/Backend/satfunctableencoder.cc
@@ -24,7 +24,7 @@ Edge SATEncoder::encodeEnumEntriesTablePredicateSATEncoder(BooleanPredicate *con
        Edge undefConst = encodeConstraintSATEncoder(constraint->undefStatus);
        printCNF(undefConst);
        model_print("**\n");
-       HSIteratorTableEntry *iterator = table->entries->iterator();
+       SetIteratorTableEntry *iterator = table->entries->iterator();
        uint i = 0;
        while (iterator->hasNext()) {
                TableEntry *entry = iterator->next();
@@ -183,7 +183,7 @@ void SATEncoder::encodeEnumEntriesTableElemFuncSATEncoder(ElementFunction *func)
        Table *table = ((FunctionTable *) (func->function))->table;
        uint size = table->entries->getSize();
        Edge constraints[size];
-       HSIteratorTableEntry *iterator = table->entries->iterator();
+       SetIteratorTableEntry *iterator = table->entries->iterator();
        uint i = 0;
        while (iterator->hasNext()) {
                TableEntry *entry = iterator->next();

diff --git a/src/Collections/corestructs.h b/src/Collections/corestructs.h
index 867feb7673a1e467ce5bc541734a1cd4a6c29ced..48447af7f440e63ed1548a342c9a45f6b79de47f 100644 (file)
--- a/src/Collections/corestructs.h
+++ b/src/Collections/corestructs.h
@@ -5,6 +5,6 @@
 #include "hashset.h"
 
 typedef HashSet<Boolean *, uintptr_t, 4> HashSetBoolean;
-typedef HSIterator<Boolean *, uintptr_t, 4> HSIteratorBoolean;
+typedef SetIterator<Boolean *, uintptr_t, 4> SetIteratorBoolean;
 
 #endif

diff --git a/src/Collections/hashset.h b/src/Collections/hashset.h
index c86217cc8033cb3c20b045340317c236337a0972..fa3f3272538c21c50b777fcd040a79197c3bc372 100644 (file)
--- a/src/Collections/hashset.h
+++ b/src/Collections/hashset.h
@@ -22,9 +22,9 @@ template<typename _Key, typename _KeyInt, int _Shift, unsigned int (*hash_functi
 class HashSet;
 
 template<typename _Key, typename _KeyInt, int _Shift, unsigned int (*hash_function)(_Key) = default_hash_function<_Key, _Shift, _KeyInt>, bool (*equals)(_Key, _Key) = default_equals<_Key> >
-class HSIterator {
+class SetIterator {
 public:
-       HSIterator(LinkNode<_Key> *_curr, HashSet <_Key, _KeyInt, _Shift, hash_function, equals> *_set) :
+       SetIterator(LinkNode<_Key> *_curr, HashSet <_Key, _KeyInt, _Shift, hash_function, equals> *_set) :
                curr(_curr),
                set(_set)
        {
@@ -99,7 +99,7 @@ public:
 
        HashSet<_Key, _KeyInt, _Shift, hash_function, equals> *copy() {
                HashSet<_Key, _KeyInt, _Shift, hash_function, equals> *copy = new HashSet<_Key, _KeyInt, _Shift, hash_function, equals>(table->getCapacity(), table->getLoadFactor());
-               HSIterator<_Key, _KeyInt, _Shift, hash_function, equals> *it = iterator();
+               SetIterator<_Key, _KeyInt, _Shift, hash_function, equals> *it = iterator();
                while (it->hasNext())
                        copy->add(it->next());
                delete it;
@@ -121,7 +121,7 @@ public:
         *  is already present. */
 
        void addAll(HashSet<_Key, _KeyInt, _Shift, hash_function, equals> *table) {
-               HSIterator<_Key, _KeyInt, _Shift, hash_function, equals> *it = iterator();
+               SetIterator<_Key, _KeyInt, _Shift, hash_function, equals> *it = iterator();
                while (it->hasNext())
                        add(it->next());
                delete it;
@@ -213,8 +213,8 @@ public:
                return getSize() == 0;
        }
 
-       HSIterator<_Key, _KeyInt, _Shift, hash_function, equals> *iterator() {
-               return new HSIterator<_Key, _KeyInt, _Shift, hash_function, equals>(list, this);
+       SetIterator<_Key, _KeyInt, _Shift, hash_function, equals> *iterator() {
+               return new SetIterator<_Key, _KeyInt, _Shift, hash_function, equals>(list, this);
        }
 
        /** Override: new operator */

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index 30fc93b2eafb72ee6219b2acd63c9bdb6f70e741..88cd42a0941ccaff833137237abe3ae1fc36d7ad 100644 (file)
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@ -29,9 +29,9 @@ typedef HashTable<OrderPair *, OrderPair *, uintptr_t, 4, order_pair_hash_functi
 typedef HashTable<void *, void *, uintptr_t, 4> CloneMap;
 typedef HashTable<Order* , IntegerEncodingRecord*, uintptr_t, 4> HashTableOrderIntegerEncoding; 
 
-typedef HSIterator<TableEntry *, uintptr_t, 4, table_entry_hash_function, table_entry_equals> HSIteratorTableEntry;
-typedef HSIterator<OrderEdge *, uintptr_t, 4, order_edge_hash_function, order_edge_equals> HSIteratorOrderEdge;
-typedef HSIterator<OrderNode *, uintptr_t, 4, order_node_hash_function, order_node_equals> HSIteratorOrderNode;
+typedef SetIterator<TableEntry *, uintptr_t, 4, table_entry_hash_function, table_entry_equals> SetIteratorTableEntry;
+typedef SetIterator<OrderEdge *, uintptr_t, 4, order_edge_hash_function, order_edge_equals> SetIteratorOrderEdge;
+typedef SetIterator<OrderNode *, uintptr_t, 4, order_node_hash_function, order_node_equals> SetIteratorOrderNode;
 
 
 #endif

diff --git a/src/Encoders/naiveencoder.cc b/src/Encoders/naiveencoder.cc
index ef677adf77671389a279bc736537f195a83cd36e..9b4487ebbbfd055e7e280bdd22a16a9e16e4fbbe 100644 (file)
--- a/src/Encoders/naiveencoder.cc
+++ b/src/Encoders/naiveencoder.cc
@@ -14,7 +14,7 @@
 #include <strings.h>
 
 void naiveEncodingDecision(CSolver *This) {
-       HSIteratorBoolean *iterator = This->getConstraints();
+       SetIteratorBoolean *iterator = This->getConstraints();
        while (iterator->hasNext()) {
                Boolean *boolean = iterator->next();
                naiveEncodingConstraint(boolean);

diff --git a/src/Tuner/searchtuner.cc b/src/Tuner/searchtuner.cc
index 045920628620bf9bf526e95375486ba011f81475..c3c1af7910e23d11da7dd51d64494f564230a7fb 100644 (file)
--- a/src/Tuner/searchtuner.cc
+++ b/src/Tuner/searchtuner.cc
@@ -52,7 +52,7 @@ SearchTuner::SearchTuner() {
 
 SearchTuner * SearchTuner::copyUsed() {
        SearchTuner * tuner = new SearchTuner();
-       HSIteratorTunableSetting *iterator=usedSettings.iterator();
+       SetIteratorTunableSetting *iterator=usedSettings.iterator();
        while(iterator->hasNext()) {
                TunableSetting *setting=iterator->next();
                TunableSetting *copy=new TunableSetting(setting);
@@ -63,7 +63,7 @@ SearchTuner * SearchTuner::copyUsed() {
 }
 
 SearchTuner::~SearchTuner() {
-       HSIteratorTunableSetting *iterator=settings.iterator();
+       SetIteratorTunableSetting *iterator=settings.iterator();
        while(iterator->hasNext()) {
                TunableSetting *setting=iterator->next();
                delete setting;
@@ -114,7 +114,7 @@ void SearchTuner::randomMutate() {
 }
 
 void SearchTuner::print() {
-       HSIteratorTunableSetting *iterator=settings.iterator();
+       SetIteratorTunableSetting *iterator=settings.iterator();
        while(iterator->hasNext()) {
                TunableSetting *setting=iterator->next();
                setting->print();
@@ -124,7 +124,7 @@ void SearchTuner::print() {
 }
 
 void SearchTuner::printUsed() {
-       HSIteratorTunableSetting *iterator=usedSettings.iterator();
+       SetIteratorTunableSetting *iterator=usedSettings.iterator();
        while(iterator->hasNext()) {
                TunableSetting *setting=iterator->next();
                setting->print();

diff --git a/src/Tuner/searchtuner.h b/src/Tuner/searchtuner.h
index 3470aa8bb07e3fff6bc3abf6342aa8bec08ecae8..b410d01bc4725a3c968326b874f602a150879180 100644 (file)
--- a/src/Tuner/searchtuner.h
+++ b/src/Tuner/searchtuner.h
@@ -29,7 +29,7 @@ unsigned int tunableSettingHash(TunableSetting *setting);
 bool tunableSettingEquals(TunableSetting *setting1, TunableSetting *setting2);
 
 typedef HashSet<TunableSetting *, uintptr_t, 4, tunableSettingHash, tunableSettingEquals> HashSetTunableSetting;
-typedef HSIterator<TunableSetting *, uintptr_t, 4, tunableSettingHash, tunableSettingEquals> HSIteratorTunableSetting;
+typedef SetIterator<TunableSetting *, uintptr_t, 4, tunableSettingHash, tunableSettingEquals> SetIteratorTunableSetting;
 
 class SearchTuner : public Tuner {
  public:

diff --git a/src/csolver.cc b/src/csolver.cc
index bcde64e9b84274cebed1ebabd1b14688ee7e9a42..5ee5157d31f29246f3d6dddd0c7058947d217e6f 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -72,7 +72,7 @@ CSolver::~CSolver() {
 CSolver *CSolver::clone() {
        CSolver *copy = new CSolver();
        CloneMap map;
-       HSIteratorBoolean *it = getConstraints();
+       SetIteratorBoolean *it = getConstraints();
        while (it->hasNext()) {
                Boolean *b = it->next();
                copy->addConstraint(b->clone(copy, &map));

diff --git a/src/csolver.h b/src/csolver.h
index 0f49dcde8d15af60890146a0d796a0bfbe5ee682..a37434cf3e86bc39d3c209aeda7f99a5f6d6fb1c 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -114,7 +114,7 @@ public:
 
        Tuner *getTuner() { return tuner; }
        
-       HSIteratorBoolean *getConstraints() { return constraints.iterator(); }
+       SetIteratorBoolean *getConstraints() { return constraints.iterator(); }
 
        SATEncoder *getSATEncoder() {return satEncoder;}