X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fhungarian.c;h=26bd53a02f5ae7eb8f5ec80fb1c9b004608e3b22;hb=45ecc187cee7107c83c1f9618a1e1e586df73644;hp=19ce38665076befb7f18b8b0c513f1ade605e663;hpb=b1562190f073db4e4db8917798adc20b207a38c0;p=libfirm

diff --git a/ir/adt/hungarian.c b/ir/adt/hungarian.c
index 19ce38665..26bd53a02 100644
--- a/ir/adt/hungarian.c
+++ b/ir/adt/hungarian.c
@@ -24,7 +24,14 @@
  ********************************************************************
  ********************************************************************/
 
-/* $Id$ */
+/**
+ * @file
+ * @brief   Solving the Minimum Assignment Problem using the Hungarian Method.
+ * @version $Id$
+ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -82,9 +89,7 @@ void hungarian_print_costmatrix(hungarian_problem_t *p) {
  */
 hungarian_problem_t *hungarian_new(int rows, int cols, int width, int match_type) {
 	int i;
-	hungarian_problem_t *p = xmalloc(sizeof(*p));
-
-	memset(p, 0, sizeof(p));
+	hungarian_problem_t *p = XMALLOCZ(hungarian_problem_t);
 
 	FIRM_DBG_REGISTER(p->dbg, "firm.hungarian");
 
@@ -148,6 +153,7 @@ void hungarian_prepare_cost_matrix(hungarian_problem_t *p, int mode) {
 void hungarian_add(hungarian_problem_t *p, int left, int right, int cost) {
 	assert(p->num_rows > left  && "Invalid row selected.");
 	assert(p->num_cols > right && "Invalid column selected.");
+	assert(cost >= 0);
 
 	p->cost[left][right] = cost;
 	p->max_cost          = MAX(p->max_cost, cost);
@@ -199,15 +205,15 @@ int hungarian_solve(hungarian_problem_t* p, int *assignment, int *final_cost, in
 	m    = p->num_rows;
 	n    = p->num_cols;
 
-	col_mate     = xcalloc(p->num_rows, sizeof(col_mate[0]));
-	unchosen_row = xcalloc(p->num_rows, sizeof(unchosen_row[0]));
-	row_dec      = xcalloc(p->num_rows, sizeof(row_dec[0]));
-	slack_row    = xcalloc(p->num_rows, sizeof(slack_row[0]));
+	col_mate     = XMALLOCNZ(int, p->num_rows);
+	unchosen_row = XMALLOCNZ(int, p->num_rows);
+	row_dec      = XMALLOCNZ(int, p->num_rows);
+	slack_row    = XMALLOCNZ(int, p->num_rows);
 
-	row_mate     = xcalloc(p->num_cols, sizeof(row_mate[0]));
-	parent_row   = xcalloc(p->num_cols, sizeof(parent_row[0]));
-	col_inc      = xcalloc(p->num_cols, sizeof(col_inc[0]));
-	slack        = xcalloc(p->num_cols, sizeof(slack[0]));
+	row_mate     = XMALLOCNZ(int, p->num_cols);
+	parent_row   = XMALLOCNZ(int, p->num_cols);
+	col_inc      = XMALLOCNZ(int, p->num_cols);
+	slack        = XMALLOCNZ(int, p->num_cols);
 
 	memset(assignment, -1, m * sizeof(assignment[0]));