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

Print number of cuts added, even if zero

Browse Source
master
Alinson S. Xavier 11 years ago
parent 9398a8d9ce
commit d726fd34b4
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File

19
src/gtsp-subtour.c
Unescape View File

@ -209,31 +209,24 @@ int find_exact_subtour_cuts(
// Constraints (2.1) // Constraints (2.1)
rval = find_exact_subtour_cuts_cluster_to_cluster(lp, data, &digraph, rval = find_exact_subtour_cuts_cluster_to_cluster(lp, data, &digraph,
capacities, capacities, min_cut_violation);
min_cut_violation);
abort_if(rval, "find_exact_subtour_cuts_cluster_to_cluster failed"); abort_if(rval, "find_exact_subtour_cuts_cluster_to_cluster failed");
added_cuts_count = lp->cut_pool_size - original_cut_pool_size; added_cuts_count = lp->cut_pool_size - original_cut_pool_size;
log_debug(" %d cluster-to-cluster\n", added_cuts_count);
if (added_cuts_count > 0) if (added_cuts_count > 0)
{
log_debug(" %d cluster-to-cluster\n",
added_cuts_count);
goto CLEANUP; goto CLEANUP;
}
// Constraints (2.2) // Constraints (2.2)
original_cut_pool_size = lp->cut_pool_size; original_cut_pool_size = lp->cut_pool_size;
rval = find_exact_subtour_cuts_node_to_cluster(lp, data, x, &digraph, rval = find_exact_subtour_cuts_node_to_cluster(lp, data, x, &digraph,
capacities, capacities, min_cut_violation);
min_cut_violation);
abort_if(rval, "find_exact_subtour_cuts_node_to_cluster failed"); abort_if(rval, "find_exact_subtour_cuts_node_to_cluster failed");
added_cuts_count = lp->cut_pool_size - original_cut_pool_size; added_cuts_count = lp->cut_pool_size - original_cut_pool_size;
if (added_cuts_count > 0)
{
log_debug(" %d node-to-cluster\n", added_cuts_count); log_debug(" %d node-to-cluster\n", added_cuts_count);
if (added_cuts_count > 0)
goto CLEANUP; goto CLEANUP;
}
// Constraints (2.3) // Constraints (2.3)
original_cut_pool_size = lp->cut_pool_size; original_cut_pool_size = lp->cut_pool_size;
@ -242,11 +235,9 @@ int find_exact_subtour_cuts(
abort_if(rval, "find_exact_subtour_cuts_node_to_node failed"); abort_if(rval, "find_exact_subtour_cuts_node_to_node failed");
added_cuts_count = lp->cut_pool_size - original_cut_pool_size; added_cuts_count = lp->cut_pool_size - original_cut_pool_size;
if (added_cuts_count > 0)
{
log_debug(" %d node-to-node\n", added_cuts_count); log_debug(" %d node-to-node\n", added_cuts_count);
if (added_cuts_count > 0)
goto CLEANUP; goto CLEANUP;
}
CLEANUP: CLEANUP:
graph_free(&digraph); graph_free(&digraph);