# HG changeset patch # User Nicholas Jillings # Date 1478796464 0 # Node ID eeb2e6dce5f2e58df141c596b57e0fc16eed5b64 # Parent c0854362d09da5ef13d4323dbcd69543b9a83c01# Parent 370a82784c712411395e39f7ac94de77b0127625 Merge branch 'master' into vnext diff -r c0854362d09d -r eeb2e6dce5f2 analysis/analyse.html --- a/analysis/analyse.html Wed Nov 09 13:48:36 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,751 +0,0 @@ - - - - - - - - - Analysis - - - - - - - - - - - - - -

Subjective evaluation results

- -

- XML file folder: -

- -

- Result XML files: -

- Audioholders in dataset: -

- Subjects in dataset: -

- Audioelements in dataset: -

-
-

-
- - - - - diff -r c0854362d09d -r eeb2e6dce5f2 python/comment_parser.py --- a/python/comment_parser.py Wed Nov 09 13:48:36 2016 +0000 +++ b/python/comment_parser.py Thu Nov 10 16:47:44 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 c0854362d09d -r eeb2e6dce5f2 python/evaluation_stats.py --- a/python/evaluation_stats.py Wed Nov 09 13:48:36 2016 +0000 +++ b/python/evaluation_stats.py Thu Nov 10 16:47:44 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