From cf58810e591dd48d639448e8ac1bd74ea201c110 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Sun, 13 Aug 2017 21:23:02 -0700 Subject: [PATCH] more edits --- src/Encoders/ordergraph.c | 10 +++++----- src/Encoders/ordergraph.h | 4 ++-- src/Encoders/ordernode.h | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Encoders/ordergraph.c b/src/Encoders/ordergraph.c index 01e5f02..f2f8bd0 100644 --- a/src/Encoders/ordergraph.c +++ b/src/Encoders/ordergraph.c @@ -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 ) { diff --git a/src/Encoders/ordergraph.h b/src/Encoders/ordergraph.h index 145d751..3f94442 100644 --- a/src/Encoders/ordergraph.h +++ b/src/Encoders/ordergraph.h @@ -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); diff --git a/src/Encoders/ordernode.h b/src/Encoders/ordernode.h index 60a261d..6e579ff 100644 --- a/src/Encoders/ordernode.h +++ b/src/Encoders/ordernode.h @@ -13,7 +13,8 @@ #include "mymemory.h" #include "structs.h" #include "orderedge.h" -struct OrderNode{ + +struct OrderNode { uint64_t id; HashSetOrderEdge* inEdges; HashSetOrderEdge* outEdges; -- 2.34.1