Which of these notes was played with a struck touch?

# HG changeset patch # User Giulio Moro # Date 1461543449 -3600 # Node ID f63604ce8f21d181c95fc5e46bcc3f3b8c3e994c # Parent 09326e3d502b4c41f57efe1aa13afa5525e9fd99 Update diff -r 09326e3d502b -r f63604ce8f21 hammond/tests/AB-p-s.xml --- a/hammond/tests/AB-p-s.xml Mon Apr 25 01:17:15 2016 +0100 +++ b/hammond/tests/AB-p-s.xml Mon Apr 25 01:17:29 2016 +0100 @@ -2,10 +2,23 @@ - - 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. + + 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. + + + Self assesment: + + how much were you able to tell the difference between the sounds in this section? + + + + + + + + testTimer elementTimer @@ -16,524 +29,331 @@ elementListenTracker - - + + - - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + Which of these notes was played with a STRUCK touch? - - + + - + Comment on fragment - Which of these notes was played with a struck touch? + 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 09326e3d502b -r f63604ce8f21 hammond/tests/AB-ps-pf.xml --- a/hammond/tests/AB-ps-pf.xml Mon Apr 25 01:17:15 2016 +0100 +++ b/hammond/tests/AB-ps-pf.xml Mon Apr 25 01:17:29 2016 +0100 @@ -2,10 +2,23 @@ - - In this section you will have to distinguish between notes different levels of velocity for pressed notes. For each pair, you will have to select the sound played with a higher velocity. + + In this section you will have to distinguish between different levels of velocity for pressed notes. For each pair, you will have to select the sound played with a FASTER velocity. + + + Self assesment: + + how much were you able to tell the difference between the sounds in this section? + + + + + + + + testTimer elementTimer @@ -16,268 +29,267 @@ elementListenTracker - - + + - - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these pressed notes has a higher velocity? + Which of these pressed notes has a FASTER velocity? - - + + \ No newline at end of file diff -r 09326e3d502b -r f63604ce8f21 hammond/tests/AB-ss-sf.xml --- a/hammond/tests/AB-ss-sf.xml Mon Apr 25 01:17:15 2016 +0100 +++ b/hammond/tests/AB-ss-sf.xml Mon Apr 25 01:17:29 2016 +0100 @@ -2,10 +2,23 @@ - - In this section you will have to distinguish between different levels of velocity for struck notes. For each pair, you will have to select the sound played with a higher velocity. + + In this section you will have to distinguish between different levels of velocity for struck notes. For each pair, you will have to select the sound played with a FASTER velocity. + + + Self assesment: + + how much were you able to tell the difference between the sounds in this section? + + + + + + + + testTimer elementTimer @@ -16,269 +29,267 @@ elementListenTracker - - + + - - - + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + - + Comment on fragment - Which of these struck notes has a higher velocity? + Which of these struck notes has a FASTER velocity? - - + + \ No newline at end of file diff -r 09326e3d502b -r f63604ce8f21 hammond/tests/labelling.xml --- a/hammond/tests/labelling.xml Mon Apr 25 01:17:15 2016 +0100 +++ b/hammond/tests/labelling.xml Mon Apr 25 01:17:29 2016 +0100 @@ -6,10 +6,24 @@ 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. + + + Self assesment: + + how much were you able to tell the difference between the sounds in this section? + + + + + + + + testTimer elementTimer @@ -24,7 +38,7 @@ - + Pressed slow @@ -33,29 +47,37 @@ Struck fast - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 09326e3d502b -r f63604ce8f21 interfaces/discrete.js --- a/interfaces/discrete.js Mon Apr 25 01:17:15 2016 +0100 +++ b/interfaces/discrete.js Mon Apr 25 01:17:29 2016 +0100 @@ -545,7 +545,7 @@ function buttonSubmitClick() // TODO: Only when all songs have been played! { var checks = []; - checks = checks.concat(testState.currentStateMap.interfaces[0].options); + //checks = checks.concat(testState.currentStateMap.interfaces[0].options); checks = checks.concat(specification.interfaces.options); var canContinue = true;