Fully convert ordergraph to objects

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

diff --git a/src/Backend/satorderencoder.cc b/src/Backend/satorderencoder.cc
index 6ec1f33f3e38c4e2592eb67a82e16c45142e44c9..3a3260e7bddb7f3d91bb92a7d8fc2ce976525d3a 100644 (file)
--- a/src/Backend/satorderencoder.cc
+++ b/src/Backend/satorderencoder.cc
@@ -28,17 +28,17 @@ Edge encodeOrderSATEncoder(SATEncoder *This, BooleanOrder *constraint) {
 Edge inferOrderConstraintFromGraph(Order* order, uint64_t _first, uint64_t _second){
        if (order->graph != NULL) {
                OrderGraph *graph=order->graph;
-               OrderNode *first=lookupOrderNodeFromOrderGraph(graph, _first);
-               OrderNode *second=lookupOrderNodeFromOrderGraph(graph, _second);
+               OrderNode *first=graph->lookupOrderNodeFromOrderGraph(_first);
+               OrderNode *second=graph->lookupOrderNodeFromOrderGraph(_second);
                if ((first != NULL) && (second != NULL)) {
-                       OrderEdge *edge=lookupOrderEdgeFromOrderGraph(graph, first, second);
+                       OrderEdge *edge=graph->lookupOrderEdgeFromOrderGraph(first, second);
                        if (edge != NULL) {
                                if (edge->mustPos)
                                        return E_True;
                                else if (edge->mustNeg)
                                        return E_False;
                        }
-                       OrderEdge *invedge=getOrderEdgeFromOrderGraph(graph, second, first);
+                       OrderEdge *invedge=graph->lookupOrderEdgeFromOrderGraph(second, first);
                        if (invedge != NULL) {
                                if (invedge->mustPos)
                                        return E_False;