Removed some superfluous assignments and empty lines.

[libfirm] / kaps.c

diff --git a/kaps.c b/kaps.c
index 7a819e4..88dbebd 100644 (file)
--- a/kaps.c
+++ b/kaps.c
@@ -1,3 +1,31 @@
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief   Partitioned Boolean Quadratic Problem (PBQP) solver.
+ * @date    02.10.2008
+ * @author  Sebastian Buchwald
+ * @version $Id$
+ */
+#include "config.h"
+
 #include "adt/array.h"
 
 #include "kaps.h"
@@ -19,18 +47,21 @@ pbqp_edge *get_edge(pbqp *pbqp, unsigned src_index, unsigned tgt_index)
        int len;
 
        if (tgt_index < src_index) {
-               return get_edge(pbqp, tgt_index, src_index);
+               unsigned tmp = src_index;
+               src_index    = tgt_index;
+               tgt_index    = tmp;
        }
 
        pbqp_node *src_node = get_node(pbqp, src_index);
+       pbqp_node *tgt_node = get_node(pbqp, tgt_index);
        assert(src_node);
-       assert(get_node(pbqp, tgt_index));
+       assert(tgt_node);
 
        len = ARR_LEN(src_node->edges);
 
        for (i = 0; i < len; ++i) {
                pbqp_edge *cur_edge = src_node->edges[i];
-               if (cur_edge->tgt == tgt_index) {
+               if (cur_edge->tgt == tgt_node) {
                        return cur_edge;
                }
        }
@@ -46,8 +77,21 @@ pbqp *alloc_pbqp(unsigned number_nodes)
 
        pbqp->solution = 0;
        pbqp->num_nodes = number_nodes;
+#if    KAPS_DUMP
+       pbqp->dump_file = NULL;
+#endif
        pbqp->nodes = obstack_alloc(&pbqp->obstack, number_nodes
                        * sizeof(*pbqp->nodes));
+       memset(pbqp->nodes, 0, number_nodes * sizeof(*pbqp->nodes));
+#if KAPS_STATISTIC
+       pbqp->num_bf = 0;
+       pbqp->num_edges = 0;
+       pbqp->num_r0 = 0;
+       pbqp->num_r1 = 0;
+       pbqp->num_r2 = 0;
+       pbqp->num_rm = 0;
+       pbqp->num_rn = 0;
+#endif
 
        return pbqp;
 }
@@ -63,7 +107,7 @@ void add_node_costs(pbqp *pbqp, unsigned node_index, vector *costs)
        pbqp_node *node = get_node(pbqp, node_index);
 
        if (node == NULL) {
-               node = alloc_node(pbqp, costs);
+               node = alloc_node(pbqp, node_index, costs);
                pbqp->nodes[node_index] = node;
        } else {
                vector_add(node->costs, costs);
@@ -75,6 +119,12 @@ void add_edge_costs(pbqp *pbqp, unsigned src_index, unsigned tgt_index,
 {
        pbqp_edge *edge = get_edge(pbqp, src_index, tgt_index);
 
+       if (tgt_index < src_index) {
+               pbqp_matrix_transpose(pbqp, costs);
+               add_edge_costs(pbqp, tgt_index, src_index, costs);
+               return;
+       }
+
        if (edge == NULL) {
                edge = alloc_edge(pbqp, src_index, tgt_index, costs);
        } else {
@@ -82,13 +132,23 @@ void add_edge_costs(pbqp *pbqp, unsigned src_index, unsigned tgt_index,
        }
 }
 
+num get_node_solution(pbqp *pbqp, unsigned node_index)
+{
+       pbqp_node *node = get_node(pbqp, node_index);
+       assert(node);
+
+       return node->solution;
+}
+
 num get_solution(pbqp *pbqp)
 {
        return pbqp->solution;
 }
 
+#if    KAPS_DUMP
 void set_dumpfile(pbqp *pbqp, FILE *f)
 {
        assert(pbqp);
        pbqp->dump_file = f;
 }
+#endif