automatic commit

diff --git a/graph.sh b/graph.sh
index 611eb84..70f6a94 100755 (executable)
--- a/graph.sh
+++ b/graph.sh
@@ -19,31 +19,31 @@
 # Contact <francois.fleuret@idiap.ch> for comments & bug reports        #
 #########################################################################
 
 # Contact <francois.fleuret@idiap.ch> for comments & bug reports        #
 #########################################################################
 

-echo "Parsing the log files"
+GRAPH_NAME="/tmp/roc.eps"
+
+#########################################################################
+
+echo "Parsing the log files."

 
 for p in hb h+b; do
 
 for p in hb h+b; do

-    grep ^INFO results/${p}-*/log  | grep "DECIMATED_FALSE_NEGATIVE_RATE\|DECIMATED_NB_FALSE_POSITIVES_PER_VGA" | \
-        sed -e "s/[^0-9A-Z_ .]//g" | \
+    grep ^INFO results/${p}-*/log  | \

         awk '{
                if($2 == "DECIMATED_FALSE_NEGATIVE_RATE") {
                  printf(1-$3)
         awk '{
                if($2 == "DECIMATED_FALSE_NEGATIVE_RATE") {
                  printf(1-$3)

-               } else {
+               } else if($2 == "DECIMATED_NB_FALSE_POSITIVES_PER_VGA") {

                  printf(" "$3"\n")
                }
              }' | sort -g > /tmp/${p}
 
                  printf(" "$3"\n")
                }
              }' | sort -g > /tmp/${p}
 

+    if [[ ! -s /tmp/${p} ]]; then
+        echo "Not enough data points for ${p}." >&2
+        exit 1
+    fi

 done
 
 done
 

-if [[ ! -s /tmp/hb ]] || [[ ! -s /tmp/h+b ]]; then
-    echo "Not enough data points." >&2
-    exit 1
-fi
-

 ######################################################################
 
 ######################################################################
 

-echo "Generating the graph per se"
-
-GRAPH_NAME="/tmp/roc.eps"
+echo "Generating the graph per se."

 
 gnuplot<<EOF
   set terminal postscript enhanced eps "Helvetica" 20
 
 gnuplot<<EOF
   set terminal postscript enhanced eps "Helvetica" 20