# HG changeset patch # User Giulio Moro # Date 1461527360 -3600 # Node ID 4261f898bd4c8473c0a14c6f93f18be31ccac6fc # Parent ccd074f060d3d26c7b3541774f0a10b82fa3c884 Update diff -r ccd074f060d3 -r 4261f898bd4c hammond/AB-p-s.xml --- a/hammond/AB-p-s.xml Sun Apr 24 20:49:12 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,533 +0,0 @@ - - - - - - In this section you will have to distinguish between notes played with a pressed touch and notes played with a struck touch. For each pair, you will have to select the sound played with a struck touch. - - - - testTimer - elementTimer - elementInitialPosition - elementTracker - elementFlagListenedTo - elementFlagMoved - elementListenTracker - - - - - - - - - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - - Comment on fragment - - Which of these notes was played with a struck touch? - - - - - \ No newline at end of file diff -r ccd074f060d3 -r 4261f898bd4c hammond/tests/labelling.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hammond/tests/labelling.xml Sun Apr 24 20:49:20 2016 +0100 @@ -0,0 +1,61 @@ + + + + + + In this section you will have to label each note as belonging to one of four types of touch: pressed-slow, pressed-fast, struck-slow, struck-fast. + + Listen to each sample pressing the "Play" button and then select the corresponding type of touch. + Once you are done, press the "Submit" button at the bottom of the page. + + + + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + + + Pressed slow + Pressed fast + Struck slow + Struck fast + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ccd074f060d3 -r 4261f898bd4c test_list.php --- a/test_list.php Sun Apr 24 20:49:12 2016 +0100 +++ b/test_list.php Sun Apr 24 20:49:20 2016 +0100 @@ -4,7 +4,7 @@ $baseUrl = 'index.html?url=hammond/tests'.$lang.'/'; $preSurvey = $defaultTestEntry; $preSurvey['url'] = $baseUrl.'pre_survey.xml'; - $preSurvey['string'] = 'Pre-survey'; + $preSurvey['string'] = 'Survey'; $trainingVideo = $defaultTestEntry; $trainingVideo['url'] = 'embedded_player.php?v=kcRtyvQxbgU'; @@ -33,5 +33,5 @@ $seed = hexdec(substr($id, -8)); //shuffling only the order of the ABtests fisherYatesShuffle($abTests, $seed); - $tests = array_merge(Array($preSurvey), Array($trainingVideo), Array($trainingSamples), $abTests, Array($likertTest), Array($postSurvey)); + $tests = array_merge(Array($preSurvey), Array($trainingVideo), Array($trainingSamples), $abTests, Array($likertTest));