X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=folded-ctf.git;a=blobdiff_plain;f=graph.sh;h=70f6a9442b0191c5ac1cda9eace606fb94df8673;hp=611eb840b1710335d3d95166b228397c408dd510;hb=346c6fdc3c36ca10142234cce291031064fa2b48;hpb=20ec321944108cd1fe74b37ea45db3ba1a2d526a

diff --git a/graph.sh b/graph.sh
index 611eb84..70f6a94 100755
--- a/graph.sh
+++ b/graph.sh
@@ -19,31 +19,31 @@
 # 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
-    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)
-               } else {
+               } else if($2 == "DECIMATED_NB_FALSE_POSITIVES_PER_VGA") {
                  printf(" "$3"\n")
                }
              }' | sort -g > /tmp/${p}
 
+    if [[ ! -s /tmp/${p} ]]; then
+        echo "Not enough data points for ${p}." >&2
+        exit 1
+    fi
 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