projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
methods need no offset
[libfirm]
/
ir
/
adt
/
bipartite.c
diff --git
a/ir/adt/bipartite.c
b/ir/adt/bipartite.c
index
6c3f8f5
..
8c0f628
100644
(file)
--- a/
ir/adt/bipartite.c
+++ b/
ir/adt/bipartite.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyrig
th (C) 1995-2007
University of Karlsruhe. All right reserved.
+ * Copyrig
ht (C) 1995-2008
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-19,13
+19,11
@@
/**
* @file
/**
* @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>
#include <stdio.h>
#include <assert.h>
@@
-34,24
+32,20
@@
#include "bipartite.h"
#include "xmalloc.h"
#include "bipartite.h"
#include "xmalloc.h"
-struct
_
bipartite_t {
+struct bipartite_t {
int n_left, n_right;
bitset_t *adj[1];
};
bipartite_t *bipartite_new(int n_left, int n_right)
{
int n_left, n_right;
bitset_t *adj[1];
};
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;
gr->n_left = n_left;
gr->n_right = n_right;
- for(i = 0; i < n_left; ++i)
+ for
(i = 0; i < n_left; ++i)
gr->adj[i] = bitset_malloc(n_right);
return gr;
gr->adj[i] = bitset_malloc(n_right);
return gr;
@@
-60,7
+54,7
@@
bipartite_t *bipartite_new(int n_left, int n_right)
void bipartite_free(bipartite_t *gr)
{
int i;
void bipartite_free(bipartite_t *gr)
{
int i;
- for(i = 0; i < gr->n_left; ++i)
+ for
(i = 0; i < gr->n_left; ++i)
bitset_free(gr->adj[i]);
free(gr);
}
bitset_free(gr->adj[i]);
free(gr);
}
@@
-90,18
+84,18
@@
static int apply_alternating_path(const bipartite_t *gr, int *matching,
int done_something = 0;
bitset_t *tmp = bitset_alloca(gr->n_right);
int done_something = 0;
bitset_t *tmp = bitset_alloca(gr->n_right);
- for(left = 0; left < gr->n_left; ++left) {
+ for
(left = 0; left < gr->n_left; ++left) {
bitset_t *left_adj = gr->adj[left];
int i;
bitset_copy(tmp, left_adj);
bitset_t *left_adj = gr->adj[left];
int i;
bitset_copy(tmp, left_adj);
- if(matching[left] >= 0) {
+ if
(matching[left] >= 0) {
int old_right = matching[left];
/* Check of all neighbors of the left node are already matched.
* We cannot improve this edge then. */
int old_right = matching[left];
/* Check of all neighbors of the left node are already matched.
* We cannot improve this edge then. */
- if(bitset_contains(left_adj, matched_right))
+ if
(bitset_contains(left_adj, matched_right))
continue;
bitset_andnot(tmp, matched_right);
continue;
bitset_andnot(tmp, matched_right);
@@
-113,12
+107,12
@@
static int apply_alternating_path(const bipartite_t *gr, int *matching,
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
*/
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) && !bitset_is_set(matched_left, i))
+ for
(i = 0; i < gr->n_left; ++i)
+ 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. */
break;
/* If no such node can be found, exit. */
- if(i >= gr->n_left)
+ if
(i >= gr->n_left)
continue;
/* Else, we can improve this edge. */
continue;
/* Else, we can improve this edge. */
@@
-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);
assert(!bitset_is_set(matched_left, left));
bitset_andnot(tmp, matched_right);
- if
(bitset_popcnt(tmp) == 0
)
+ if
(bitset_is_empty(tmp)
)
continue;
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);
assert(!bitset_is_set(matched_right, right));
matching[left] = right;
bitset_set(matched_left, left);
@@
-156,21
+150,23
@@
void bipartite_matching(const bipartite_t *gr, int *matching)
bitset_t *matched_right = bitset_alloca(gr->n_right);
memset(matching, -1, gr->n_left * sizeof(int));
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));
+ while (apply_alternating_path(gr, matching, matched_left, matched_right)) {
+ }
}
void bipartite_dump_f(FILE *f, const bipartite_t *gr)
{
int i;
}
void bipartite_dump_f(FILE *f, const bipartite_t *gr)
{
int i;
- for(i = 0; i < gr->n_left; ++i) {
+ for
(i = 0; i < gr->n_left; ++i) {
fprintf(f, "%d: ", i);
bitset_fprint(f, gr->adj[i]);
fprintf(f, "\n");
}
}
fprintf(f, "%d: ", i);
bitset_fprint(f, gr->adj[i]);
fprintf(f, "\n");
}
}
-void bipartite_dump(const char *name, const bipartite_t *gr) {
+void bipartite_dump(const char *name, const bipartite_t *gr)
+{
FILE *f = fopen(name, "w");
if (f) {
FILE *f = fopen(name, "w");
if (f) {