automatic commit

diff --git a/folding.cc b/folding.cc
index 5d13bdb..92b6230 100644 (file)
--- a/folding.cc
+++ b/folding.cc
@@ -218,8 +218,6 @@ int main(int argc, char **argv) {
       detector->write(&out);
     }
 
-    //////////////////////////////////////////////////////////////////////
-
     else if(strcmp(new_argv[c], "read-detector") == 0) {
       cout << "-- READ DETECTOR -----------------------------------------------------" << endl;
 

diff --git a/run.sh b/run.sh
index 678c00e..9c5175c 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -84,7 +84,7 @@ RESULT_DIR=./results
 case $1 in
 
     #####################################################################
-    ## Generate the pictures from the paper
+    ## Generate illustrating pictures
 
     pics)
 
@@ -94,7 +94,11 @@ case $1 in
 
         if [[ -d "${EXPERIMENT_RESULT_DIR}" ]]; then
 
-            for npf in -1 0 2497; 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} \
@@ -136,10 +140,13 @@ case $1 in
                 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
+                        # 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"
@@ -160,7 +167,7 @@ case $1 in
 
                 else
 
-                    echo "${EXPERIMENT_RESULT_DIR} exists, aborting experiment."
+                    echo "${EXPERIMENT_RESULT_DIR} exists, cancelling that run."
 
                 fi