diff --git a/bin/evaluate b/bin/evaluate index 18c9f6cf28ba5feddd1f221ca090ab1696418887..6f538b2d223009fd481f1bb7e359e920fe6e686f 100755 --- a/bin/evaluate +++ b/bin/evaluate @@ -165,7 +165,6 @@ echo "Evaluating..." INDEX=0 for file in $TARGETS do - FNAME=`basename $file .lg` nextFile="_ERROR_" if [ $MODE == "Dir" ] @@ -256,9 +255,12 @@ else 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 -python3 $LgEvalDir/src/sumDiff.py $ResultsDir/$BNAME.diff $ResultsDir/labelsGT.txt > $ResultsDir/ConfusionMatrices.csv +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 +python3 $LgEvalDir/src/sumDiff.py $ResultsDir/$BNAME.diff $ResultsDir/labelsGT.txt > \ + $ResultsDir/ConfusionMatrices.csv ################################################################ @@ -269,12 +271,12 @@ python3 $LgEvalDir/src/sumDiff.py $ResultsDir/$BNAME.diff $ResultsDir/labelsGT.t # Use awk and head to select every odd (headers) and even (data) columns, # Concatenate one header row with data contents. awk -F',' '{ for (i=1;i<=NF;i+=2) printf ("%s%c", $i, i + 2 <= NF ? "," : "\n")}' $ResultsDir/$BNAME.csv > $ResultsDir/Headers.csv +awk -F',' '{ for (i=2;i<=NF;i+=2) printf ("%s%c", $i, i + 2 <= NF ? "," : "\n")}' $ResultsDir/$BNAME.csv > $ResultsDir/Data.csv # Obtain first row for data labels; insert a "File" label in the first column. head -n 1 $ResultsDir/Headers.csv > $ResultsDir/HeaderRow.csv HEAD=`cat $ResultsDir/HeaderRow.csv` echo "File,Result,$HEAD" > $ResultsDir/HeaderRow.csv -awk -F',' '{ for (i=2;i<=NF;i+=2) printf ("%s%c", $i, i + 2 <= NF ? "," : "\n")}' $ResultsDir/$BNAME.csv > $ResultsDir/Data.csv # Combine file names with raw data metrics, then add header labels. paste -d , $ResultsDir/FileResults.csv $ResultsDir/Data.csv > $ResultsDir/DataNew.csv @@ -285,7 +287,9 @@ cat $ResultsDir/HeaderRow.csv $ResultsDir/DataNew.csv > $ResultsDir/FileMetrics. # Clean up ################################## rm -f $ResultsDir/Headers.csv $ResultsDir/HeaderRow.csv $ResultsDir/Data.csv -rm -f $ResultsDir/DataNew.csv $ResultsDir/FileResults.csv +rm -f $ResultsDir/DataNew.csv +# RZ: not deleting FileResults, to insure that all files are present. +#rm -f $ResultsDir/FileResults.csv rm -f $ResultsDir/$BNAME.csv $ResultsDir/$BNAME.diff