onerow: add cut selection parameters
This commit is contained in:
@@ -3,28 +3,21 @@ for i in out/*yaml; do
|
||||
IN=${i/.pre.yaml/}
|
||||
IN=${IN/out\//}
|
||||
grep -q mip_value $i && continue
|
||||
echo $IN
|
||||
grep $IN instances/opt.tab | awk '{ print "mip_value:\n "$2 }' >> $i
|
||||
done
|
||||
|
||||
echo " TABLE 1 "
|
||||
echo "--------------------------------------------------------------------------------"
|
||||
printf "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw origgap mirperf wperf mircontrib wcontrib wimprov wtime | tee 'tables/gap.csv'
|
||||
printf "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw origgap mirperf wperf mircontrib wcontrib wimprov wtime > 'tables/gap.csv'
|
||||
for i in out/*.yaml; do
|
||||
IN=${i/.yaml/}
|
||||
IN=${IN/out\//}
|
||||
printf "%s," $IN
|
||||
scripts/gap.rb $i
|
||||
done | sort -t',' -nrsk 8 | sed -e 's/,$//g' | tee -a 'tables/gap.csv'
|
||||
done | sed -e 's/,$//g' >> 'tables/gap.csv'
|
||||
|
||||
echo
|
||||
echo
|
||||
echo " TABLE 2 "
|
||||
echo "--------------------------------------------------------------------------------"
|
||||
printf "%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw mirt wedget avgm | tee 'tables/speed.csv'
|
||||
printf "%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw mirt wedget avgm > 'tables/speed.csv'
|
||||
for i in out/*.yaml; do
|
||||
IN=${i/.yaml/}
|
||||
IN=${IN/out\//}
|
||||
printf "%s," $IN
|
||||
scripts/speed.rb $i
|
||||
done | sort | sed -e 's/,$//g' | tee -a 'tables/speed.csv'
|
||||
done | sort | sed -e 's/,$//g' >> 'tables/speed.csv'
|
||||
|
||||
@@ -149,21 +149,21 @@ int main(int argc, char **argv)
|
||||
if (enable_gomory_cuts)
|
||||
{
|
||||
time_printf("Generating Gomory cuts...\n");
|
||||
cplexHelper.add_single_row_cuts<GomoryCutGenerator>();
|
||||
cplexHelper.add_single_row_cuts<GomoryCutGenerator>(0);
|
||||
cplexHelper.solve(true);
|
||||
}
|
||||
|
||||
if (enable_mir_cuts)
|
||||
{
|
||||
time_printf("Generating MIR cuts...\n");
|
||||
cplexHelper.add_single_row_cuts<MIRCutGenerator>();
|
||||
cplexHelper.add_single_row_cuts<MIRCutGenerator>(0);
|
||||
cplexHelper.solve(true);
|
||||
}
|
||||
|
||||
if (enable_wedge_cuts)
|
||||
{
|
||||
time_printf("Generating wedge cuts...\n");
|
||||
cplexHelper.add_single_row_cuts<WedgeCutGenerator>();
|
||||
cplexHelper.add_single_row_cuts<WedgeCutGenerator>(MAX_GOOD_ROWS);
|
||||
cplexHelper.solve(true);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user