Update analysis script and metrics.

Author: joseasoler

ANALYSIS.md

@@ -111,6 +111,6 @@ The following commands should be executed once for each dataset.
 
 ```
 python.exe .\comparedds.py --todds --texconv --batch [Path to datasets]\[Dataset] [Path to output files] > [Path to results]\[dataset_name]_batch.csv
-python.exe .\comparedds.py --todds --metrics [Path to datasets]\[Dataset] [Path to output files] > [Path to results]\[dataset_name]_metrics.csv
-python.exe .\comparedds.py --texconv --metrics [Path to datasets]\[Dataset] [Path to output files] > [Path to results]\[dataset_name]_metrics.csv
+python.exe .\comparedds.py --todds --metrics [Path to datasets]\[Dataset] [Path to output files] > [Path to results]\[dataset_name]_todds_metrics.csv
+python.exe .\comparedds.py --texconv --metrics [Path to datasets]\[Dataset] [Path to output files] > [Path to results]\[dataset_name]_texconv_metrics.csv
 ```

tools/comparedds.py

@@ -267,7 +267,7 @@ def calculate_metrics(arguments, input_files):
     csv_out = csv.writer(sys.stdout, lineterminator='\n')
     # ToDo FLIP fails on every data set.
     # csv_out.writerow(['File', 'Tool', 'FLIP (Mean)', 'PSNR'])
-    csv_out.writerow(['File', 'Tool', 'PSNR'])
+    csv_out.writerow(['File', 'Tool', 'PSNR', 'SSIM'])
     for tool, data in encoder_data.items():
         if getattr(arguments, tool):
             output_path = os.path.join(args.output, tool)
@@ -278,10 +278,11 @@ def calculate_metrics(arguments, input_files):
                 decode_png(dds_file, png_file)
                 # flip_mean = calculate_flip(input_file, png_file)
                 psnr = calculate_metric(input_file, png_file, 'PSNR')
+                ssim = calculate_metric(input_file, png_file, 'SSIM')
                 if os.sep in input_file:
                     input_file = input_file.rpartition(os.sep)[-1]
                 # csv_out.writerow([input_file, tool, flip_mean, psnr])
-                csv_out.writerow([input_file, tool, psnr])
+                csv_out.writerow([input_file, tool, psnr, ssim])
 
 
 if __name__ == '__main__':