PBQP edges now have pointers to their incident node, instead of only their index...

[libfirm] / pbqp_edge.c

diff --git a/pbqp_edge.c b/pbqp_edge.c
index e59b7e8..f12e2f0 100644 (file)
--- a/pbqp_edge.c
+++ b/pbqp_edge.c
@@ -9,10 +9,16 @@
 #include "pbqp_node_t.h"
 #include "pbqp_t.h"
 
-pbqp_edge *alloc_edge(pbqp *pbqp, int src_index, int tgt_index, matrix *costs)
+pbqp_edge *alloc_edge(pbqp *pbqp, int src_index, int tgt_index, pbqp_matrix *costs)
 {
+       int transpose = 0;
+
        if (tgt_index < src_index) {
-               return alloc_edge(pbqp, tgt_index, src_index, costs);
+               int tmp = src_index;
+               src_index = tgt_index;
+               tgt_index = tmp;
+
+               transpose = 1;
        }
 
        pbqp_edge *edge = obstack_alloc(&pbqp->obstack, sizeof(*edge));
@@ -20,13 +26,15 @@ pbqp_edge *alloc_edge(pbqp *pbqp, int src_index, int tgt_index, matrix *costs)
 
        pbqp_node *src_node = get_node(pbqp, src_index);
        assert(src_node);
-       edge->src = src_node;
 
        pbqp_node *tgt_node = get_node(pbqp, tgt_index);
        assert(tgt_node);
-       edge->tgt = tgt_node;
 
-       edge->costs = matrix_copy(pbqp, costs);
+       if (transpose) {
+               edge->costs = pbqp_matrix_copy_and_transpose(pbqp, costs);
+       } else {
+               edge->costs = pbqp_matrix_copy(pbqp, costs);
+       }
 
        /*
         * Connect edge with incident nodes. Since the edge is allocated, we know
@@ -39,3 +47,19 @@ pbqp_edge *alloc_edge(pbqp *pbqp, int src_index, int tgt_index, matrix *costs)
 
        return edge;
 }
+
+void delete_edge(pbqp_edge *edge)
+{
+       pbqp_node  *src_node;
+       pbqp_node  *tgt_node;
+
+       assert(edge);
+
+       src_node = edge->src;
+       tgt_node = edge->tgt;
+       assert(src_node);
+       assert(tgt_node);
+
+       disconnect_edge(src_node, edge);
+       disconnect_edge(tgt_node, edge);
+}