isoron/gtsp
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Alinson S. Xavier
2015-03-31 11:50:19 -04:00
parent 07c14a33ab
commit 79798c4dc3
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gtsp-comb.c
View File

@@ -90,24 +90,27 @@ int add_comb_cut(
#if LOG_LEVEL >= LOG_LEVEL_DEBUG #if LOG_LEVEL >= LOG_LEVEL_DEBUG
log_debug("Generated cut:\n"); log_debug("Generated cut:\n");
for (int i = 0; i < nz; i++) if(OPTIMAL_X)
{ {
if (OPTIMAL_X[rmatind[i]] < LP_EPSILON) continue; for (int i = 0; i < nz; i++)
{
if (OPTIMAL_X[rmatind[i]] < LP_EPSILON) continue;
if (rmatind[i] >= node_count) if (rmatind[i] >= node_count)
{ {
struct Edge *e = &graph->edges[rmatind[i] - node_count]; struct Edge *e = &graph->edges[rmatind[i] - node_count];
log_debug(" %.2lf x%d (%d %d %.4lf)\n", rmatval[i], rmatind[i], log_debug(" %.2lf x%d (%d %d %.4lf)\n", rmatval[i], rmatind[i],
e->from->index, e->to->index, OPTIMAL_X[rmatind[i]]); e->from->index, e->to->index, OPTIMAL_X[rmatind[i]]);
} }
else else
{ {
log_debug(" %.2lf x%d (%.4lf)\n", rmatval[i], rmatind[i], log_debug(" %.2lf x%d (%.4lf)\n", rmatval[i], rmatind[i],
OPTIMAL_X[rmatind[i]]); OPTIMAL_X[rmatind[i]]);
}
} }
log_debug(" %c %.2lf\n", sense, rhs);
} }
log_debug(" %c %.2lf\n", sense, rhs); #endif
#endif
if (OPTIMAL_X) if (OPTIMAL_X)
{ {
@@ -492,4 +495,4 @@ int write_shrunken_graph(
CLEANUP: CLEANUP:
return rval; return rval;
} }