Mercurial > hg > waet-hammond-1

changeset 21:1ed0c5908575

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update: break long words in training, added test duration in test_base.php
author Giulio Moro <giuliomoro@yahoo.it>
date Fri, 13 May 2016 18:50:16 +0100
parents 3cbb9e7a359c
children 1f375b7d75fd
files new/hammond/tests/training.xml new/test_list.php
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/new/hammond/tests/training.xml	Thu May 12 18:39:26 2016 +0100
+++ b/new/hammond/tests/training.xml	Fri May 13 18:50:16 2016 +0100
@@ -32,10 +32,10 @@
         <interface>
             <title>Example 1</title>
         </interface>
-        <audioelement url="./samples/C25-Line out-number0007-velocity003-pressed.wav" id="track-5" label="Pressed-slow" inactive="true"/>
-        <audioelement url="./samples/C25-Line out-number0076-velocity021-pressed.wav" id="track-6" label="Pressed-fast" inactive="true"/>
-        <audioelement url="./samples/C25-Line out-number0176-velocity063-struck.wav" id="track-7" label="Struck-slow" inactive="true"/>
-        <audioelement url="./samples/C25-Line out-number0236-velocity110-struck.wav" id="track-8" label="Struck-fast" inactive="true"/>
+        <audioelement url="./samples/C25-Line out-number0007-velocity003-pressed.wav" id="track-5" label="Pressed slow" inactive="true"/>
+        <audioelement url="./samples/C25-Line out-number0076-velocity021-pressed.wav" id="track-6" label="Pressed fast" inactive="true"/>
+        <audioelement url="./samples/C25-Line out-number0176-velocity063-struck.wav" id="track-7" label="Struck slow" inactive="true"/>
+        <audioelement url="./samples/C25-Line out-number0236-velocity110-struck.wav" id="track-8" label="Struck fast" inactive="true"/>
         <survey location="before">
             <surveyentry type="statement" id="ascsadc" mandatory="true">
                 <statement>Listen carefully to the differences between different types of touch on the same key.
@@ -53,19 +53,19 @@
         <interface>
             <title>Example 2</title>
         </interface>
-        <audioelement url="./samples/E41-Line out-number0031-velocity002-pressed.wav" id="track-9" label="Pressed-slow"  inactive="true"/>
-        <audioelement url="./samples/E41-Line out-number0081-velocity028-pressed.wav" id="track-10" label="Pressed-fast" inactive="true"/>
-        <audioelement url="./samples/E41-Line out-number0136-velocity055-struck.wav" id="track-11" label="Struck-slow" inactive="true"/>
-        <audioelement url="./samples/E41-Line out-number0246-velocity106-struck.wav" id="track-12" label="Struck-fast" inactive="true"/>
+        <audioelement url="./samples/E41-Line out-number0031-velocity002-pressed.wav" id="track-9" label="Pressed slow"  inactive="true"/>
+        <audioelement url="./samples/E41-Line out-number0081-velocity028-pressed.wav" id="track-10" label="Pressed fast" inactive="true"/>
+        <audioelement url="./samples/E41-Line out-number0136-velocity055-struck.wav" id="track-11" label="Struck slow" inactive="true"/>
+        <audioelement url="./samples/E41-Line out-number0246-velocity106-struck.wav" id="track-12" label="Struck fast" inactive="true"/>
     </page>
     <page id="test-1" hostURL="hammond/" randomiseOrder="false" repeatCount="0" loop="false" showElementComments="false" loudness="-12" label="given" preSilence="0.2" >
         <interface>
             <title>Example 3</title>
         </interface>
-        <audioelement url="./samples/Ab9-Line out-number0024-velocity004-pressed.wav" id="track-1" label="Pressed-slow" inactive="true"/>
-        <audioelement url="./samples/Ab9-Line out-number0122-velocity033-pressed.wav" id="track-2" label="Pressed-fast" inactive="true"/>
-        <audioelement url="./samples/Ab9-Line out-number0185-velocity055-struck.wav" id="track-3" label="Struck-slow" inactive="true" />
-        <audioelement url="./samples/Ab9-Line out-number0199-velocity103-struck.wav" id="track-4" label="Struck-fast" inactive="true"/>
+        <audioelement url="./samples/Ab9-Line out-number0024-velocity004-pressed.wav" id="track-1" label="Pressed slow" inactive="true"/>
+        <audioelement url="./samples/Ab9-Line out-number0122-velocity033-pressed.wav" id="track-2" label="Pressed fast" inactive="true"/>
+        <audioelement url="./samples/Ab9-Line out-number0185-velocity055-struck.wav" id="track-3" label="Struck slow" inactive="true" />
+        <audioelement url="./samples/Ab9-Line out-number0199-velocity103-struck.wav" id="track-4" label="Struck fast" inactive="true"/>
     </page>
     <page id="test-7" hostURL="hammond/" randomiseOrder="false" repeatCount="0" loop="false" showElementComments="false" loudness="-12" preSilence="0.2" label="given">
         <interface>
--- a/new/test_list.php	Thu May 12 18:39:26 2016 +0100
+++ b/new/test_list.php	Fri May 13 18:50:16 2016 +0100
@@ -24,15 +24,15 @@
   
   $abxTest = $defaultTestEntry;
   $abxTest['url'] = $baseUrl.'ABX.xml';
-  $abxTest['string'] = 'A/B/X (72 pages)';
+  $abxTest['string'] = 'A/B/X (72 pages, about 18 minutes)';
 
   $abTests = Array($defaultTestEntry, $defaultTestEntry, $defaultTestEntry);
   $abTests[0]['url'] = $baseUrl.'AB-p-s.xml';
-  $abTests[0]['string'] = 'A/B pressed/struck (24 pages)';
+  $abTests[0]['string'] = 'A/B pressed/struck (24 pages, about 3 minutes)';
   $abTests[1]['url'] = $baseUrl.'AB-ps-pf.xml';
-  $abTests[1]['string'] = 'A/B fast/slow pressed (24 pages)';
+  $abTests[1]['string'] = 'A/B fast/slow pressed (24 pages, about 3 minutes)';
   $abTests[2]['url'] = $baseUrl.'AB-ss-sf.xml';
-  $abTests[2]['string'] = 'A/B fast/slow struck (24 pages)';
+  $abTests[2]['string'] = 'A/B fast/slow struck (24 pages, about 3 minutes)';
 
   $likertTest = $defaultTestEntry;
   $likertTest['url'] = $baseUrl.'labelling.xml';