projects
/
folded-ctf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
automatic commit
[folded-ctf.git]
/
run.sh
diff --git
a/run.sh
b/run.sh
index
42dc58b
..
9c5175c
100755
(executable)
--- a/
run.sh
+++ b/
run.sh
@@
-13,13
+13,15
@@
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
-# Written by Francois Fleuret, (C) IDIAP #
+# Written by Francois Fleuret #
+# (C) Idiap Research Institute #
+# #
# Contact <francois.fleuret@idiap.ch> for comments & bug reports #
#########################################################################
MAIN_URL="http://www.idiap.ch/folded-ctf"
# Contact <francois.fleuret@idiap.ch> for comments & bug reports #
#########################################################################
MAIN_URL="http://www.idiap.ch/folded-ctf"
-######################################################################
+######################################################################
###
# Compiling
make -j -k
# Compiling
make -j -k
@@
-31,7
+33,7
@@
fi
echo
echo
-######################################################################
+######################################################################
###
# Generating the pool file
DATA_PATH=./rmk-data
# Generating the pool file
DATA_PATH=./rmk-data
@@
-77,13
+79,13
@@
else
fi
fi
-######################################################################
-# Running the computation per se
-
RESULT_DIR=./results
case $1 in
RESULT_DIR=./results
case $1 in
+ #####################################################################
+ ## Generate illustrating pictures
+
pics)
SEED=0
pics)
SEED=0
@@
-92,14
+94,18
@@
case $1 in
if [[ -d "${EXPERIMENT_RESULT_DIR}" ]]; then
if [[ -d "${EXPERIMENT_RESULT_DIR}" ]]; then
- for n in -1 0 2501 2504; do
+ # Value of -1 corresponds to saving the images with the
+ # ground-truth or the pi-referentials alone, while other
+ # values show registered pi-feature windows.
+
+ for npf in -1 0 2500; do
./folding --random-seed=${SEED} \
--pool-name=${POOL_NAME} \
./folding --random-seed=${SEED} \
--pool-name=${POOL_NAME} \
- --result-path=
${EXPERIMENT_RESULT_DIR}
\
+ --result-path=
/tmp/
\
--detector-name=${EXPERIMENT_RESULT_DIR}/default.det \
--detector-name=${EXPERIMENT_RESULT_DIR}/default.det \
- --nb-images=
1
\
- --material-feature-nb=${n} \
+ --nb-images=
63
\
+ --material-feature-nb=${n
pf
} \
open-pool \
read-detector \
write-pool-images
open-pool \
read-detector \
write-pool-images
@@
-114,6
+120,9
@@
case $1 in
;;
;;
+ #####################################################################
+ ## Run the full computation
+
valgrind|"")
if [[ ! -d ${RESULT_DIR} ]]; then
valgrind|"")
if [[ ! -d ${RESULT_DIR} ]]; then
@@
-131,10
+140,13
@@
case $1 in
if [[ $? == 0 ]]; then
if [[ $MODE == "h+b" ]]; then
if [[ $? == 0 ]]; then
if [[ $MODE == "h+b" ]]; then
- OPTS="${OPTS} --force-head-belly-independence=yes"
+ OPTS="--force-head-belly-independence=yes"
+ else
+ OPTS=""
fi
if [[ $1 == "valgrind" ]]; then
fi
if [[ $1 == "valgrind" ]]; then
+ # The valgrind operation runs a simpler computation in valgrind
OPTS="${OPTS} --nb-classifiers-per-level=1 --nb-weak-learners-per-classifier=10"
OPTS="${OPTS} --proportion-for-train=0.1 --proportion-for-validation=0.025 --proportion-for-test=0.01"
OPTS="${OPTS} --wanted-true-positive-rate=0.1"
OPTS="${OPTS} --nb-classifiers-per-level=1 --nb-weak-learners-per-classifier=10"
OPTS="${OPTS} --proportion-for-train=0.1 --proportion-for-validation=0.025 --proportion-for-test=0.01"
OPTS="${OPTS} --wanted-true-positive-rate=0.1"
@@
-155,7
+167,7
@@
case $1 in
else
else
- echo "${EXPERIMENT_RESULT_DIR} exists,
aborting experiment
."
+ echo "${EXPERIMENT_RESULT_DIR} exists,
cancelling that run
."
fi
fi