X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fbipartite.c;h=4c47e97edc859ff5f0906afa8575190a1e57eee9;hb=1852308bd33b77378f0fca9e5347d4f9082464c4;hp=40f84e70bdc978366d8e4db212a46bbd6d4d3e34;hpb=974215da1a935f250766874d0f7a7ddfa34bc4ef;p=libfirm

diff --git a/ir/adt/bipartite.c b/ir/adt/bipartite.c
index 40f84e70b..4c47e97ed 100644
--- a/ir/adt/bipartite.c
+++ b/ir/adt/bipartite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -19,13 +19,11 @@
 
 /**
  * @file
- * @brief  Specialized implementation for perfect bipartite matching.
- * @author Sebastian Hack
- * @cvs-id $Id$
+ * @brief   Specialized implementation for perfect bipartite matching.
+ * @author  Sebastian Hack
+ * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <assert.h>
@@ -41,12 +39,8 @@ struct _bipartite_t {
 
 bipartite_t *bipartite_new(int n_left, int n_right)
 {
-	int i, size;
-	bipartite_t *gr;
-
-	size = n_left > 0 ? n_left - 1 : 0;
-	gr = xmalloc(sizeof(*gr) + size * sizeof(void *));
-	memset(gr, 0, sizeof(*gr));
+	bipartite_t *gr = XMALLOCFZ(bipartite_t, adj, n_left);
+	int i;
 
 	gr->n_left = n_left;
 	gr->n_right = n_right;
@@ -135,10 +129,10 @@ static int apply_alternating_path(const bipartite_t *gr, int *matching,
 			assert(!bitset_is_set(matched_left, left));
 
 			bitset_andnot(tmp, matched_right);
-			if(bitset_popcnt(tmp) == 0)
+			if(bitset_is_empty(tmp))
 				continue;
 
-			right = bitset_min(tmp);
+			right = bitset_next_set(tmp, 0);
 			assert(!bitset_is_set(matched_right, right));
 			matching[left] = right;
 			bitset_set(matched_left, left);