projects
/
morpheus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove OpenMP dependency (and unused variable)
[morpheus.git]
/
pkg
/
src
/
hungarian.c
diff --git
a/pkg/src/hungarian.c
b/pkg/src/hungarian.c
index
9671a43
..
3b2a28d
100644
(file)
--- a/
pkg/src/hungarian.c
+++ b/
pkg/src/hungarian.c
@@
-112,7
+112,7
@@
void hungarian_free(hungarian_problem_t* p) {
void hungarian_solve(hungarian_problem_t* p)
{
int i, j, m, n, k, l, t, q, unmatched;
void hungarian_solve(hungarian_problem_t* p)
{
int i, j, m, n, k, l, t, q, unmatched;
- double
cost, s;
+ double
s; //,cost
int* col_mate;
int* row_mate;
int* parent_row;
int* col_mate;
int* row_mate;
int* parent_row;
@@
-122,7
+122,7
@@
void hungarian_solve(hungarian_problem_t* p)
double* slack;
int* slack_row;
double* slack;
int* slack_row;
- cost = 0.;
+
//
cost = 0.;
m =p->num_rows;
n =p->num_cols;
m =p->num_rows;
n =p->num_cols;
@@
-160,7
+160,7
@@
void hungarian_solve(hungarian_problem_t* p)
for (k=1; k<m; k++)
if (p->cost[k][l]<s)
s=p->cost[k][l];
for (k=1; k<m; k++)
if (p->cost[k][l]<s)
s=p->cost[k][l];
- cost+=s;
+
//
cost+=s;
if (s!=0.)
for (k=0; k<m; k++)
p->cost[k][l]-=s;
if (s!=0.)
for (k=0; k<m; k++)
p->cost[k][l]-=s;
@@
-335,11
+335,11
@@
done:
}
/*TRACE("\n");*/
}
}
/*TRACE("\n");*/
}
- for (i=0; i<m; i++)
+
/*
for (i=0; i<m; i++)
cost+=row_dec[i];
for (i=0; i<n; i++)
cost-=col_inc[i];
cost+=row_dec[i];
for (i=0; i<n; i++)
cost-=col_inc[i];
-
+*/
free(slack);
free(col_inc);
free(parent_row);
free(slack);
free(col_inc);
free(parent_row);