# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1478787774 0
# Node ID 56847aaebc9b8e20fbdc2b20457c1e927d3e9df0
# Parent  829a67368dc4fd88d538aa90259bbe835ee72cd1# Parent  370a82784c712411395e39f7ac94de77b0127625
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 829a67368dc4 -r 56847aaebc9b python/comment_parser.py
--- a/python/comment_parser.py	Wed Nov 09 15:21:01 2016 +0000
+++ b/python/comment_parser.py	Thu Nov 10 14:22:54 2016 +0000
@@ -9,7 +9,7 @@
 # COMMAND LINE ARGUMENTS
 
 assert len(sys.argv)<3, "comment_parser takes at most 1 command line argument\n"+\
-                        "Use: python score_parser.py [rating_folder_location]"
+                        "Use: python comment_parser.py [rating_folder_location]"
 
 # XML results files location
 if len(sys.argv) == 1:
@@ -45,7 +45,7 @@
             page_name = audioholder.get('ref')               # get page name
             
             if page_name is None: # ignore 'empty' audio_holders
-                print("WARNING: " + file + " contains empty page. (comment_parser.py)")
+                print("WARNING: " + file + " contains empty page.")
                 break
                 
             if audioholder.get("state") != "complete":
diff -r 829a67368dc4 -r 56847aaebc9b python/evaluation_stats.py
--- a/python/evaluation_stats.py	Wed Nov 09 15:21:01 2016 +0000
+++ b/python/evaluation_stats.py	Thu Nov 10 14:22:54 2016 +0000
@@ -69,8 +69,7 @@
             not_played = 0 # for this page
             not_moved = 0 # for this page
             
-            # 'testTime' keeps total duration: subtract time so far for duration of this page
-            duration = float(page.find("./metric/metricresult[@id='testTime']").text) - total_duration
+            duration = float(page.find("./metric/metricresult[@id='testTime']").text) #- total_duration
             
             # total duration of test
             total_duration += duration