bug fixes

[satune.git] / src / ASTAnalyses / Order / orderanalysis.cc

diff --git a/src/ASTAnalyses/Order/orderanalysis.cc b/src/ASTAnalyses/Order/orderanalysis.cc
index 8a991a490625725016a501e6d51c35823b8c3d5f..cd50ed91269d8685a99b5d40601038525ebe1aac 100644 (file)
--- a/src/ASTAnalyses/Order/orderanalysis.cc
+++ b/src/ASTAnalyses/Order/orderanalysis.cc
@@ -12,15 +12,15 @@
 #include "tunable.h"
 
 /** Returns a table that maps a node to the set of nodes that can reach the node. */
 #include "tunable.h"
 
 /** Returns a table that maps a node to the set of nodes that can reach the node. */

-HashtableNodeToNodeSet * getMustReachMap(CSolver  *solver, OrderGraph *graph, Vector<OrderNode *> *finishNodes) {
+HashtableNodeToNodeSet *getMustReachMap(CSolver  *solver, OrderGraph *graph, Vector<OrderNode *> *finishNodes) {

        uint size = finishNodes->getSize();
        HashtableNodeToNodeSet *table = new HashtableNodeToNodeSet(128, 0.25);
        uint size = finishNodes->getSize();
        HashtableNodeToNodeSet *table = new HashtableNodeToNodeSet(128, 0.25);

-       
+

        for (int i = size - 1; i >= 0; i--) {
                OrderNode *node = finishNodes->get(i);
                HashsetOrderNode *sources = new HashsetOrderNode(4, 0.25);
                table->put(node, sources);
        for (int i = size - 1; i >= 0; i--) {
                OrderNode *node = finishNodes->get(i);
                HashsetOrderNode *sources = new HashsetOrderNode(4, 0.25);
                table->put(node, sources);

-               
+

                {
                        //Compute source sets
                        SetIteratorOrderEdge *iterator = node->inEdges.iterator();
                {
                        //Compute source sets
                        SetIteratorOrderEdge *iterator = node->inEdges.iterator();


@@ -39,18 +39,18 @@ HashtableNodeToNodeSet * getMustReachMap(CSolver  *solver, OrderGraph *graph, Ve
        return table;
 }
 
        return table;
 }
 

-void DFSClearContradictions(CSolver *solver, OrderGraph *graph, HashtableNodeToNodeSet * table, Vector<OrderNode *> *finishNodes, bool computeTransitiveClosure) {
+void DFSClearContradictions(CSolver *solver, OrderGraph *graph, HashtableNodeToNodeSet *table, Vector<OrderNode *> *finishNodes, bool computeTransitiveClosure) {

        uint size = finishNodes->getSize();
 
        for (int i = size - 1; i >= 0; i--) {
                OrderNode *node = finishNodes->get(i);
                HashsetOrderNode *sources = table->get(node);
        uint size = finishNodes->getSize();
 
        for (int i = size - 1; i >= 0; i--) {
                OrderNode *node = finishNodes->get(i);
                HashsetOrderNode *sources = table->get(node);

-               
+

                if (computeTransitiveClosure) {
                        //Compute full transitive closure for nodes
                        SetIteratorOrderNode *srciterator = sources->iterator();
                        while (srciterator->hasNext()) {
                if (computeTransitiveClosure) {
                        //Compute full transitive closure for nodes
                        SetIteratorOrderNode *srciterator = sources->iterator();
                        while (srciterator->hasNext()) {

-                               OrderNode *srcnode = (OrderNode*)srciterator->next();
+                               OrderNode *srcnode = (OrderNode *)srciterator->next();

                                OrderEdge *newedge = graph->getOrderEdgeFromOrderGraph(srcnode, node);
                                newedge->mustPos = true;
                                newedge->polPos = true;
                                OrderEdge *newedge = graph->getOrderEdgeFromOrderGraph(srcnode, node);
                                newedge->mustPos = true;
                                newedge->polPos = true;


@@ -105,7 +105,7 @@ void reachMustAnalysis(CSolver *solver, OrderGraph *graph, bool computeTransitiv
        //Topologically sort the mustPos edge graph
        graph->DFSMust(&finishNodes);
        graph->resetNodeInfoStatusSCC();
        //Topologically sort the mustPos edge graph
        graph->DFSMust(&finishNodes);
        graph->resetNodeInfoStatusSCC();

-       HashtableNodeToNodeSet * table=getMustReachMap(solver, graph, & finishNodes);
+       HashtableNodeToNodeSet *table = getMustReachMap(solver, graph, &finishNodes);

        //Find any backwards edges that complete cycles and force them to be mustNeg
        DFSClearContradictions(solver, graph, table, &finishNodes, computeTransitiveClosure);
        table->resetAndDeleteVals();
        //Find any backwards edges that complete cycles and force them to be mustNeg
        DFSClearContradictions(solver, graph, table, &finishNodes, computeTransitiveClosure);
        table->resetAndDeleteVals();