diff --git a/bin/evaluate b/bin/evaluate index b2f20d01dc6f3375019de3451b1d88d9174961df..18c9f6cf28ba5feddd1f221ca090ab1696418887 100755 --- a/bin/evaluate +++ b/bin/evaluate @@ -64,7 +64,9 @@ ResultsDir=Results_$BNAME # output files are ignored. ################################################################ +echo "" echo "[ LgEval evaluate ]" +echo "" # Case 1: Passed a list of file pairs if ! [ -d $1 ] @@ -116,6 +118,7 @@ echo "* LgEval Results Directory: $ResultsDir" TARGET_COUNT=$((`echo $TARGETS | wc -w`)) + ################################################################ # Create output directory structure, compile class labels ################################################################ @@ -218,15 +221,21 @@ do # Add record of evaluating the file. OUTCOME_LIST=`printf "%s\n%s" "$OUTCOME_LIST" "$nextFile, $CORRECT"` - else - echo " * Already processed: $file" fi + #else + # echo " * Already processed: $file" + #fi INDEX=$((INDEX+1)) PERCENT=`echo "scale=1; 100 * $INDEX / $TARGET_COUNT" | bc` - echo -ne " $PERCENT% complete ($INDEX of $TARGET_COUNT)\r" + if [ $((`expr $INDEX % 1`)) == 0 ] + then + echo -ne " $PERCENT% complete ($INDEX of $TARGET_COUNT)\r" + fi done +echo -ne " $PERCENT% complete ($INDEX of $TARGET_COUNT)\r" + ################################################################ # Compile metrics @@ -246,7 +255,6 @@ else touch $ResultsDir/$BNAME.diff # empty - no errors. fi - # Compute summaries python3 $LgEvalDir/src/sumMetric.py "$LABEL_STRING" $ResultsDir/$BNAME.csv > $ResultsDir/Summary.txt python3 $LgEvalDir/src/sumDiff.py $ResultsDir/$BNAME.diff $ResultsDir/labelsGT.txt html > $ResultsDir/ConfusionMatrices.html @@ -272,6 +280,7 @@ awk -F',' '{ for (i=2;i<=NF;i+=2) printf ("%s%c", $i, i + 2 <= NF ? "," : "\n")} paste -d , $ResultsDir/FileResults.csv $ResultsDir/Data.csv > $ResultsDir/DataNew.csv cat $ResultsDir/HeaderRow.csv $ResultsDir/DataNew.csv > $ResultsDir/FileMetrics.csv + ################################## # Clean up ################################## @@ -279,11 +288,15 @@ rm -f $ResultsDir/Headers.csv $ResultsDir/HeaderRow.csv $ResultsDir/Data.csv rm -f $ResultsDir/DataNew.csv $ResultsDir/FileResults.csv rm -f $ResultsDir/$BNAME.csv $ResultsDir/$BNAME.diff + +################################## +# Remind user of outputs +################################## echo "" echo "done." echo "" echo "$ResultsDir/ contents:" -echo " Summary.txt -- Evaluation metrics summary" +echo " Summary.txt -- Readable metrics summary" echo " FileMetrics.csv -- Raw metrics file" echo " labelsOut.txt -- Node & edge labels in output files" echo " labelsGT.txt -- Node & edge labels in ground truth files"