# HG changeset patch # User Giulio Moro # Date 1461288462 -3600 # Node ID d4ccb6739bdf8048b0d0093bf504fa94e96c12de # Parent f1744d5c6407cd197bac6ac22b959dce10e5c113 Updates, doing alright diff -r f1744d5c6407 -r d4ccb6739bdf .hgignore --- a/.hgignore Fri Apr 22 02:27:26 2016 +0100 +++ b/.hgignore Fri Apr 22 02:27:42 2016 +0100 @@ -54,4 +54,4 @@ example_eval/samples/* .hgrc *.orig - +*.wav diff -r f1744d5c6407 -r d4ccb6739bdf hammond/labelling.xml --- a/hammond/labelling.xml Fri Apr 22 02:27:26 2016 +0100 +++ b/hammond/labelling.xml Fri Apr 22 02:27:42 2016 +0100 @@ -1,7 +1,12 @@ - + + + In this section you will have to label each note as belonging to one of the four classes seen before: pressed-slow, pressed-fast, struck-slow, struck-fast. + + + testTimer elementTimer elementInitialPosition @@ -14,31 +19,42 @@ - - + + - + - Low velocity, pressed - Mid-low velocity, pressed - Mid-high velocity, percussive - High velocity, percussive + Pressed slow + Pressed fast + Struck slow + Struck fast - - - - - Low velocity, pressed - Mid-low velocity, pressed - Mid-high velocity, percussive - High velocity, percussive - - - + + + + + + + + + + + + + + + + + + + + + + + - diff -r f1744d5c6407 -r d4ccb6739bdf hammond/tests/AB-p-s.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hammond/tests/AB-p-s.xml Fri Apr 22 02:27:42 2016 +0100 @@ -0,0 +1,539 @@ + + + + + + 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? + + + + + + Comment on fragment + + Which of these notes was played with a struck touch? + + + + + \ No newline at end of file diff -r f1744d5c6407 -r d4ccb6739bdf hammond/tests/AB-ps-pf.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hammond/tests/AB-ps-pf.xml Fri Apr 22 02:27:42 2016 +0100 @@ -0,0 +1,283 @@ + + + + + + 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. + + + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + + Comment on fragment + + Which of these pressed notes has a higher velocity? + + + + + \ No newline at end of file diff -r f1744d5c6407 -r d4ccb6739bdf hammond/tests/AB-ss-sf.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hammond/tests/AB-ss-sf.xml Fri Apr 22 02:27:42 2016 +0100 @@ -0,0 +1,283 @@ + + + + + + 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. + + + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + + Comment on fragment + + Which of these struck notes has a higher velocity? + + + + + \ No newline at end of file diff -r f1744d5c6407 -r d4ccb6739bdf hammond/tests/post_survey.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hammond/tests/post_survey.xml Fri Apr 22 02:27:42 2016 +0100 @@ -0,0 +1,49 @@ + + + + + + Please enter your location. (example mandatory text question) + + + Please enter your age (example non-mandatory number question) + + + Please rate this interface (example radio button question) + + + + + + + Thank you for taking this listening test. May God be with you. + + + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + + + + + \ No newline at end of file diff -r f1744d5c6407 -r d4ccb6739bdf hammond/tests/pre_survey.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hammond/tests/pre_survey.xml Fri Apr 22 02:27:42 2016 +0100 @@ -0,0 +1,37 @@ + + + + + + + __PLEASE_ENTER_YOUR_NAME__ + + + __CHECKBOX_ACTIVITIES__ + + + + + + + + + + + + + + + + + + + + + diff -r f1744d5c6407 -r d4ccb6739bdf hammond/tests/training.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hammond/tests/training.xml Fri Apr 22 02:27:42 2016 +0100 @@ -0,0 +1,130 @@ + + + + + + In this section you will be able to listen to a set of examples which will help you familiarize with the sound of the Hammond organ. + + + + + Now that you have completed the training, you are ready to start the listening test. + + + + testTimer + elementTimer + elementInitialPosition + elementTracker + elementFlagListenedTo + elementFlagMoved + elementListenTracker + + + + + + + + + + + + + Click on the button to listen to the note + + + + + + + + Listen carefully to the differences between different types of touch on the same key. You can listen to each sample multiple times. + + + + + + Click on the button to listen to the note + + + + + + + + + Click on the button to listen to the note + + + + + + + + + + Which of these pressed notes was played with a HIGHER velocity? + + + + + + In this section you will practice with the interface that will be used for this listening test. + + + + Press the "listen" button to listen to each sample.\n Once you pick your answer, click on the "A" or "B" red box accordingly and the box will turn green. At this point click 'submit' to submit your answer. In case you do not know which one to pick, just click submit without selecting any answer. + + + + Here is the first example question: which of these pressed notes was played with a HIGHER velocity? + + + + + + The correct answer to this question was "B". + + + + + + + Which of these notes was played with a STRUCK touch? + + + + + + Now a different example question: which of these notes was played with a STRUCK touch? + + + + + + The correct answer to this question was "A". + + + + + + + Which of these struck notes was played with a HIGHER velocity? + + + + + + Which of these struck notes was played with a HIGHER velocity? + + + + + + The correct answer to this question was "A". + + + + + \ No newline at end of file diff -r f1744d5c6407 -r d4ccb6739bdf test_list.php --- a/test_list.php Fri Apr 22 02:27:26 2016 +0100 +++ b/test_list.php Fri Apr 22 02:27:42 2016 +0100 @@ -1,7 +1,7 @@