Debug FileResults.tsv generation

bin/evaluate

@@ -218,12 +218,16 @@ do
 			fi
 		fi
 
-		# Add record of evaluating the file.
-		OUTCOME_LIST=`printf "%s\n%s" "$OUTCOME_LIST" "$nextFile, $CORRECT"`
+		# Record whether file was correct or not.
+		if [ $((INDEX)) == 0 ]
+		then
+			OUTCOME_LIST="$nextFile, $CORRECT"
+		else
+			OUTCOME_LIST=`printf "%s\n%s" "$OUTCOME_LIST" "$nextFile, $CORRECT"`
+		fi
+	else
+		echo "  * Already processed: $file"
 	fi
-	#else
-	#	echo "  * Already processed: $file"
-	#fi
 
 	INDEX=$((INDEX+1))
 	PERCENT=`echo "scale=1; 100 * $INDEX / $TARGET_COUNT" | bc`
@@ -237,12 +241,18 @@ echo -ne "  $PERCENT% complete ($INDEX of $TARGET_COUNT)\r"
 
 
 ################################################################
-# Compile metrics
+# Compile metrics 
 # Including summaries and confusion matrices
 #
 # Stored as individual files to prevent re-computation for user
 ################################################################
-echo "$OUTCOME_LIST" >> $ResultsDir/FileResults.csv
+
+if [ -n "$OUTCOME_LIST" ]
+then
+	# Need to avoid adding empty entries in FileResults.csv, and sort by filename
+	echo "$OUTCOME_LIST" >> $ResultsDir/FileResults.csv
+	sort -o $ResultsDir/FileResults.csv $ResultsDir/FileResults.csv
+fi
 cat $ResultsDir/Metrics/*.csv > $ResultsDir/$BNAME.csv
 
 ALLDIFFS=`ls $ResultsDir/Metrics | grep .diff`
@@ -264,10 +274,8 @@ python3 $LgEvalDir/src/sumDiff.py $ResultsDir/$BNAME.diff $ResultsDir/labelsGT.t
 
 
 ################################################################
-# Create spreadsheet
+# Create FileMetrics.csv and summary spreadsheet
 ################################################################
-# RZ Oct. 2014: Create spreadsheet pairing file names with metrics.
-# Clean up raw metric data to make the file smaller and simpler.
 # 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
@@ -301,6 +309,7 @@ echo "done."
 echo ""
 echo "$ResultsDir/ contents:"
 echo "   Summary.txt     --   Readable metrics summary"
+echo "   FileResults.csv --   Records which files are correct/incorrect"
 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"