lifting: Change sample sizes; add missing experiments
This commit is contained in:
@@ -17,9 +17,6 @@ if [ ! -f $RUN ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
INSTANCES="instances/filtered/all.txt"
|
INSTANCES="instances/filtered/all.txt"
|
||||||
SAMPLES_SLOW=10
|
|
||||||
SAMPLES_MEDIUM=100
|
|
||||||
SAMPLES_FAST=1000
|
|
||||||
SEED=1240
|
SEED=1240
|
||||||
|
|
||||||
# ORIGINAL
|
# ORIGINAL
|
||||||
@@ -36,29 +33,29 @@ DIR=orig-100
|
|||||||
mkdir -p $DIR; rm -f $DIR/*log $DIR/*yaml
|
mkdir -p $DIR; rm -f $DIR/*log $DIR/*yaml
|
||||||
|
|
||||||
title Heuristic
|
title Heuristic
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_FAST --heuristic --log $DIR/heur.log --stats $DIR/heur.yaml || exit
|
$RUN $COMMON_OPTS --samples 250000 --heuristic --log $DIR/heur.log --stats $DIR/heur.yaml || exit
|
||||||
|
|
||||||
title Bound Original
|
title Bound Original
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_FAST --bound --log $DIR/bound.log --stats $DIR/bound.yaml || exit
|
$RUN $COMMON_OPTS --samples 17000 --bound --log $DIR/bound.log --stats $DIR/bound.yaml || exit
|
||||||
|
|
||||||
title Bound Pre-processing
|
title Bound Pre-processing
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_FAST --bound --preprocess --log $DIR/bound-pre.log --stats $DIR/bound-pre.yaml || exit
|
$RUN $COMMON_OPTS --samples 12000 --bound --preprocess --log $DIR/bound-pre.log --stats $DIR/bound-pre.yaml || exit
|
||||||
|
|
||||||
title Naive Bounding-Box
|
title Naive Bounding-Box
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_MEDIUM --naive --log $DIR/naive-bbox.log --stats $DIR/naive-bbox.yaml || exit
|
$RUN $COMMON_OPTS --samples 300 --naive --log $DIR/naive-bbox.log --stats $DIR/naive-bbox.yaml || exit
|
||||||
|
|
||||||
title Naive Fixed-M
|
title Naive Fixed-M
|
||||||
M=50
|
M=50
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_SLOW --naive --fixed-bounds $M --log $DIR/naive-fixed-$M.log --stats $DIR/naive-fixed-$M.yaml || exit
|
$RUN $COMMON_OPTS --samples 30 --naive --fixed-bounds $M --log $DIR/naive-fixed-$M.log --stats $DIR/naive-fixed-$M.yaml || exit
|
||||||
|
|
||||||
title Naive Bounding-Box Pre-processing
|
title Naive Bounding-Box Pre-processing
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_SLOW --naive --preprocess --log $DIR/naive-bbox-pre.log --stats $DIR/naive-bbox-pre.yaml || exit
|
$RUN $COMMON_OPTS --samples 300 --naive --preprocess --log $DIR/naive-bbox-pre.log --stats $DIR/naive-bbox-pre.yaml || exit
|
||||||
|
|
||||||
title MIP
|
title MIP
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_SLOW --mip --log $DIR/mip.log --stats $DIR/mip.yaml || exit
|
$RUN $COMMON_OPTS --samples 10 --mip --log $DIR/mip.log --stats $DIR/mip.yaml || exit
|
||||||
|
|
||||||
title MIP Pre-processing
|
title MIP Pre-processing
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_SLOW --mip --preprocess --log $DIR/mip-pre.log --stats $DIR/mip-pre.yaml || exit
|
$RUN $COMMON_OPTS --samples 10 --mip --preprocess --log $DIR/mip-pre.log --stats $DIR/mip-pre.yaml || exit
|
||||||
|
|
||||||
# SHEAR
|
# SHEAR
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
@@ -73,21 +70,28 @@ COMMON_OPTS="$COMMON_OPTS --check-answers $ANSWERS"
|
|||||||
DIR=shear-100
|
DIR=shear-100
|
||||||
mkdir -p $DIR; rm -f $DIR/*log $DIR/*yaml
|
mkdir -p $DIR; rm -f $DIR/*log $DIR/*yaml
|
||||||
|
|
||||||
title Bound Pre-processing + Shear
|
title Heuristic + Shear
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_FAST --bound --preprocess --log $DIR/bound-pre.log --stats $DIR/bound-pre.yaml || exit
|
$RUN $COMMON_OPTS --samples 250000 --heuristic --log $DIR/heur.log --stats $DIR/heur.yaml || exit
|
||||||
|
|
||||||
title Bound Original + Shear
|
title Bound Original + Shear
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_MEDIUM --bound --log $DIR/bound.log --stats $DIR/bound.yaml || exit
|
$RUN $COMMON_OPTS --samples 500 --bound --log $DIR/bound.log --stats $DIR/bound.yaml || exit
|
||||||
|
|
||||||
|
title Bound Pre-processing + Shear
|
||||||
|
$RUN $COMMON_OPTS --samples 13000 --bound --preprocess --log $DIR/bound-pre.log --stats $DIR/bound-pre.yaml || exit
|
||||||
|
|
||||||
title Naive Bounding-Box + Shear
|
title Naive Bounding-Box + Shear
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_SLOW --naive --log $DIR/naive-bbox.log --stats $DIR/naive-bbox.yaml || exit
|
$RUN $COMMON_OPTS --samples 10 --naive --log $DIR/naive-bbox.log --stats $DIR/naive-bbox.yaml || exit
|
||||||
|
|
||||||
title Naive Fixed-M + Shear
|
title Naive Fixed-M + Shear
|
||||||
M=50
|
M=50
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_MEDIUM --naive --fixed-bounds $M --log $DIR/naive-fixed-$M.log --stats $DIR/naive-fixed-$M.yaml || exit
|
$RUN $COMMON_OPTS --samples 30 --naive --fixed-bounds $M --log $DIR/naive-fixed-$M.log --stats $DIR/naive-fixed-$M.yaml || exit
|
||||||
|
|
||||||
|
title MIP + Shear
|
||||||
|
$RUN $COMMON_OPTS --samples 10 --mip --log $DIR/mip.log --stats $DIR/mip.yaml || exit
|
||||||
|
|
||||||
|
title MIP Pre-processing + Shear
|
||||||
|
$RUN $COMMON_OPTS --samples 10 --mip --preprocess --log $DIR/mip-pre.log --stats $DIR/mip-pre.yaml || exit
|
||||||
|
|
||||||
title MIP
|
|
||||||
$RUN $COMMON_OPTS --samples $SAMPLES_SLOW --mip --log $DIR/mip.log --stats $DIR/mip.yaml || exit
|
|
||||||
|
|
||||||
# TABLES
|
# TABLES
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user