more edits
authorbdemsky <bdemsky@uci.edu>
Mon, 14 Aug 2017 04:23:02 +0000 (21:23 -0700)
committerbdemsky <bdemsky@uci.edu>
Mon, 14 Aug 2017 04:23:02 +0000 (21:23 -0700)
src/Encoders/ordergraph.c
src/Encoders/ordergraph.h
src/Encoders/ordernode.h

index 01e5f028a1f782f93f15333e3b3189456ef9482b..f2f8bd01afb7a30c9928714f21e8cef0d489cb36 100644 (file)
@@ -14,14 +14,14 @@ void addOrderEdge(OrderGraph* graph, OrderNode* node1, OrderNode* node2, Boolean
        switch(constr->polarity){
                case P_BOTHTRUEFALSE:
                case P_TRUE:{
-                       OrderEdge* _1to2 = getOrderEdgeFromOrderGraph(graph, constr, node1, node2);
+                       OrderEdge* _1to2 = getOrderEdgeFromOrderGraph(graph, node1, node2);
                        addNewOutgoingEdge(node1, _1to2);
                        addNewIncomingEdge(node2, _1to2);
                        if(constr->polarity == P_TRUE)
                                break;
                }
                case P_FALSE:{
-                       OrderEdge* _2to1 = getOrderEdgeFromOrderGraph(graph, constr, node2, node1);
+                       OrderEdge* _2to1 = getOrderEdgeFromOrderGraph(graph, node2, node1);
                        addNewOutgoingEdge(node2, _2to1);
                        addNewIncomingEdge(node1, _2to1);
                        break;
@@ -35,16 +35,16 @@ void addOrderEdge(OrderGraph* graph, OrderNode* node1, OrderNode* node2, Boolean
 OrderNode* getOrderNodeFromOrderGraph(OrderGraph* graph, uint64_t id) {
        OrderNode* node = allocOrderNode(id);
        OrderNode* tmp = getHashSetOrderNode(graph->nodes, node);
-       if( tmp!= NULL){
+       if( tmp != NULL){
                deleteOrderNode(node);
-               node= tmp;
+               node = tmp;
        } else {
                addHashSetOrderNode(graph->nodes, node);
        }
        return node;
 }
 
-OrderEdge* getOrderEdgeFromOrderGraph(OrderGraph* graph, Boolean* order, OrderNode* begin, OrderNode* end){
+OrderEdge* getOrderEdgeFromOrderGraph(OrderGraph* graph, OrderNode* begin, OrderNode* end) {
        OrderEdge* edge = allocOrderEdge(begin, end);
        OrderEdge* tmp = getHashSetOrderEdge(graph->edges, edge);
        if ( tmp!= NULL ) {
index 145d751288b0b60928c7cf095ef4703c49f929a0..3f944425116dc37d3994b70474325db68b791ab0 100644 (file)
@@ -11,7 +11,7 @@
 #include "structs.h"
 #include "mymemory.h"
 
-struct OrderGraph{
+struct OrderGraph {
        HashSetOrderNode* nodes;
        HashSetOrderEdge* edges;
        VectorOrderNode scc;
@@ -20,7 +20,7 @@ struct OrderGraph{
 OrderGraph* allocOrderGraph();
 void addOrderConstraintToOrderGraph(OrderGraph* graph, Boolean* constr);
 OrderNode* getOrderNodeFromOrderGraph(OrderGraph* graph, uint64_t id);
-OrderEdge* getOrderEdgeFromOrderGraph(OrderGraph* graph, Boolean* order, OrderNode* begin, OrderNode* end);
+OrderEdge* getOrderEdgeFromOrderGraph(OrderGraph* graph, OrderNode* begin, OrderNode* end);
 void addOrderEdge(OrderGraph* graph, OrderNode* node1, OrderNode* node2, Boolean* constr);
 void deleteOrderGraph(OrderGraph* graph);
 
index 60a261da1fdc7baccc3a316f559bb22cd4d391ee..6e579ff2582c0b6113b4bcdcde0b8afe20a38af0 100644 (file)
@@ -13,7 +13,8 @@
 #include "mymemory.h"
 #include "structs.h"
 #include "orderedge.h"
-struct OrderNode{
+
+struct OrderNode {
        uint64_t id;
        HashSetOrderEdge* inEdges;
        HashSetOrderEdge* outEdges;