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

Handle instances without reduced costs

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-11-18 17:14:44 -06:00
parent 267325902d
commit 1267701a2c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
onerow/library/src/wedge_cut_generator.cpp
View File

@@ -284,7 +284,8 @@ void WedgeCutGenerator::eval_next()
{ {
while (true) while (true)
{ {
if (0 <= cur_facet && cur_facet < (int) knapsack.list.size() && cur_facet <= MAX_CUT_DEPTH) if (0 <= cur_facet && cur_facet < (int) knapsack.list.size() &&
cur_facet <= MAX_CUT_DEPTH)
break; break;
r1_offset++; r1_offset++;
@@ -296,7 +297,7 @@ void WedgeCutGenerator::eval_next()
} }
int r1_index = row.c.pi.index(r1_offset); int r1_index = row.c.pi.index(r1_offset);
if(row.reduced_costs[r1_index] < row.cost_cutoff) if (row.reduced_costs && row.reduced_costs[r1_index] < row.cost_cutoff)
continue; continue;
r1[0] = -row.c.pi.value(r1_offset).reduce(REDUCE_FACTOR_R1); r1[0] = -row.c.pi.value(r1_offset).reduce(REDUCE_FACTOR_R1);

3
onerow/library/tests/wedge_cut_generator_test.cpp
View File

@@ -125,6 +125,7 @@ TEST(WedgeCutGenerator, generate_test_1)
r.c.pi.push(1, rational(-1)); r.c.pi.push(1, rational(-1));
r.c.pi.push(2, rational(1)); r.c.pi.push(2, rational(1));
r.c.pi_zero = rational(5,7); r.c.pi_zero = rational(5,7);
r.reduced_costs = 0;
std::set<Constraint> expected_cuts; std::set<Constraint> expected_cuts;
rational cut_matrix[] = { rational cut_matrix[] = {
@@ -176,6 +177,7 @@ TEST(WedgeCutGenerator, generate_test_2)
r.c.pi.push(1, rational(-1)); r.c.pi.push(1, rational(-1));
r.c.pi.push(2, rational(1)); r.c.pi.push(2, rational(1));
r.c.pi_zero = rational(1,2); r.c.pi_zero = rational(1,2);
r.reduced_costs = 0;
set<Constraint> expected_cuts; set<Constraint> expected_cuts;
rational cut_matrix[] = { rational cut_matrix[] = {
@@ -236,6 +238,7 @@ TEST(WedgeCutGenerator, generate_test_3)
r.c.pi.push(12, rational(237478,39665)); r.c.pi.push(12, rational(237478,39665));
r.c.pi.push(13, rational(237478,39665)); r.c.pi.push(13, rational(237478,39665));
r.c.pi_zero = rational(631975,707651); r.c.pi_zero = rational(631975,707651);
r.reduced_costs = 0;
rational solution[14]; rational solution[14];
solution[0] = rational(0); solution[0] = rational(0);