X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fbipartite.c;h=9a1bb816887e09429801d90c4a8eb6b4147ff637;hb=f274dcf35aa0d3f4748387dbddfe50e8d7d44951;hp=493f72f9e472605e3fbe4361d342a98afa0f1bdc;hpb=827fd51d34b3e9aacdb2e14587055b902d7767a4;p=libfirm

diff --git a/ir/adt/bipartite.c b/ir/adt/bipartite.c
index 493f72f9e..9a1bb8168 100644
--- a/ir/adt/bipartite.c
+++ b/ir/adt/bipartite.c
@@ -8,18 +8,20 @@
 
 struct _bipartite_t {
 	int n_left, n_right;
-	bitset_t **adj;
+	bitset_t *adj[1];
 };
 
 bipartite_t *bipartite_new(int n_left, int n_right)
 {
-	int i;
-	bipartite_t *gr = xmalloc(sizeof(*gr) + n_left * sizeof(void *));
+	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));
 
 	gr->n_left = n_left;
 	gr->n_right = n_right;
-	gr->adj = (bitset_t**)(gr + 1);
 
 	for(i = 0; i < n_left; ++i)
 		gr->adj[i] = bitset_malloc(n_right);
@@ -58,7 +60,7 @@ static int apply_alternating_path(const bipartite_t *gr, int *matching,
 {
 	int left, right;
 	int done_something = 0;
-	bitset_t *tmp = bitset_malloc(gr->n_left);
+	bitset_t *tmp = bitset_alloca(gr->n_right);
 
 	for(left = 0; left < gr->n_left; ++left) {
 		bitset_t *left_adj = gr->adj[left];
@@ -79,10 +81,12 @@ static int apply_alternating_path(const bipartite_t *gr, int *matching,
 
 			assert(right != -1);
 
-			/* We have to find another left node which has the old right
-			 * one as a neighbor. */
+			/*
+				We have to find another left node which has the old right one as a neighbor.
+				This node must not be part of a matching
+			*/
 			for(i = 0; i < gr->n_left; ++i)
-				if(i != left && bitset_is_set(gr->adj[i], old_right))
+				if(i != left && bitset_is_set(gr->adj[i], old_right) && !bitset_is_set(matched_left, i))
 					break;
 
 			/* If no such node can be found, exit. */
@@ -115,24 +119,19 @@ static int apply_alternating_path(const bipartite_t *gr, int *matching,
 		}
 	}
 
-	bitset_free(tmp);
-
 	return done_something;
 }
 
 void bipartite_matching(const bipartite_t *gr, int *matching)
 {
-	bitset_t *matched_left = bitset_malloc(gr->n_left);
-	bitset_t *matched_right = bitset_malloc(gr->n_right);
+	bitset_t *matched_left = bitset_alloca(gr->n_left);
+	bitset_t *matched_right = bitset_alloca(gr->n_right);
 
 	memset(matching, -1, gr->n_left * sizeof(int));
 	while(apply_alternating_path(gr, matching, matched_left, matched_right));
-
-	bitset_free(matched_left);
-	bitset_free(matched_right);
 }
 
-void bipartite_dump(FILE *f, const bipartite_t *gr)
+void bipartite_dump_f(FILE *f, const bipartite_t *gr)
 {
 	int i;
 
@@ -141,3 +140,12 @@ void bipartite_dump(FILE *f, const bipartite_t *gr)
 		fprintf(f, "\n");
 	}
 }
+
+void bipartite_dump(const char *name, const bipartite_t *gr) {
+	FILE *f = fopen(name, "w");
+
+	if (f) {
+		bipartite_dump_f(f, gr);
+		fclose(f);
+	}
+}