--- a/Block.java Thu Nov 18 11:47:32 2010 +0000
+++ b/Block.java Thu Nov 25 11:10:53 2010 +0000
@@ -2,7 +2,7 @@
* File: Block.java
* Author: Marcus Pearce <m.pearce@gold.ac.uk>
* Created: <2008-01-07 10:38:45 marcusp>
- * Time-stamp: <2010-11-18 11:04:31 marcusp>
+ * Time-stamp: <2010-11-25 11:10:05 marcusp>
*=============================================================================
*/
@@ -172,7 +172,7 @@
/* add a reponse i and time t (nanoseconds) */
public void addResponse(int i, long t) {
- // System.out.println("answer = " + i +
+ //System.out.println("answer = " + i +
// "; responseTime = " + t +
// "; startTime = " + startTime +
// "; answer = " + (t - startTime) / 1000);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Data/Midi/28hymns/filelist.txt Thu Nov 25 11:10:53 2010 +0000
@@ -0,0 +1,26 @@
+hymn_007_b.mid 26 15
+hymn_022_b.mid 22 11
+hymn_025_b.mid 9 31
+hymn_039_b.mid 21 31
+hymn_047_b.mid 10 31
+hymn_054_b.mid 22 31
+hymn_073_b.mid 9 31
+hymn_081_b.mid 58 23
+hymn_119_b.mid 17 47
+hymn_124a_b.mid 9 31
+hymn_127_b.mid 46 31
+hymn_161_b.mid 13 31
+hymn_163_b.mid 9 29
+hymn_190_b.mid 41 31
+hymn_213_b.mid 21 31
+hymn_233_b.mid 18 31
+hymn_267_b.mid 53 29
+hymn_273_b.mid 9 31
+hymn_291_b.mid 14 31
+hymn_295_b.mid 11 31
+hymn_311_b.mid 21 47
+hymn_388b_b.mid 9 47
+hymn_444_b.mid 10 31
+hymn_526_b.mid 35 63
+hymn_542_b.mid 12 31
+hymn_565_b.mid 9 31
Binary file Data/Midi/28hymns/hymn_002bA_b.mid has changed
Binary file Data/Midi/28hymns/hymn_007_b.mid has changed
Binary file Data/Midi/28hymns/hymn_022_b.mid has changed
Binary file Data/Midi/28hymns/hymn_025_b.mid has changed
Binary file Data/Midi/28hymns/hymn_039_b.mid has changed
Binary file Data/Midi/28hymns/hymn_047_b.mid has changed
Binary file Data/Midi/28hymns/hymn_054_b.mid has changed
Binary file Data/Midi/28hymns/hymn_073_b.mid has changed
Binary file Data/Midi/28hymns/hymn_081_b.mid has changed
Binary file Data/Midi/28hymns/hymn_092_b.mid has changed
Binary file Data/Midi/28hymns/hymn_119_b.mid has changed
Binary file Data/Midi/28hymns/hymn_124a_b.mid has changed
Binary file Data/Midi/28hymns/hymn_127_b.mid has changed
Binary file Data/Midi/28hymns/hymn_161_b.mid has changed
Binary file Data/Midi/28hymns/hymn_163_b.mid has changed
Binary file Data/Midi/28hymns/hymn_190_b.mid has changed
Binary file Data/Midi/28hymns/hymn_213_b.mid has changed
Binary file Data/Midi/28hymns/hymn_233_b.mid has changed
Binary file Data/Midi/28hymns/hymn_267_b.mid has changed
Binary file Data/Midi/28hymns/hymn_273_b.mid has changed
Binary file Data/Midi/28hymns/hymn_291_b.mid has changed
Binary file Data/Midi/28hymns/hymn_295_b.mid has changed
Binary file Data/Midi/28hymns/hymn_296_b.mid has changed
Binary file Data/Midi/28hymns/hymn_311_b.mid has changed
Binary file Data/Midi/28hymns/hymn_388b_b.mid has changed
Binary file Data/Midi/28hymns/hymn_444_b.mid has changed
Binary file Data/Midi/28hymns/hymn_526_b.mid has changed
Binary file Data/Midi/28hymns/hymn_542_b.mid has changed
Binary file Data/Midi/28hymns/hymn_565_b.mid has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Data/Midi/28hymns/pfilelist.txt Thu Nov 25 11:10:53 2010 +0000
@@ -0,0 +1,2 @@
+hymn_092_b.mid 13 31
+hymn_296_b.mid 20 45
Binary file Data/Midi/FiveNotePhrases/FNP_10_144_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_11_61_5_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_12_584_5_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_13_3_3_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_14_161_5_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_14_225_4_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_14_246_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_14_408_4_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_3_56_4_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_3_79_10_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1025_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1035_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1127_0_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1251_6_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1450_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1467_0_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1505_4_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_1556_3_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_321_2_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_499_3_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_504_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_756_0_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_876_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_973_5_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_97_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_8_994_3_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_9_232_11_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_9_345_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_9_622_1_original.mid has changed
Binary file Data/Midi/FiveNotePhrases/FNP_9_673_1_original.mid has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Data/Midi/FiveNotePhrases/filelist.txt Thu Nov 25 11:10:53 2010 +0000
@@ -0,0 +1,30 @@
+FNP_10_144_1_original.mid
+FNP_11_61_5_original.mid
+FNP_12_584_5_original.mid
+FNP_13_3_3_original.mid
+FNP_14_161_5_original.mid
+FNP_14_225_4_original.mid
+FNP_14_246_1_original.mid
+FNP_14_408_4_original.mid
+FNP_3_56_4_original.mid
+FNP_3_79_10_original.mid
+FNP_8_1025_1_original.mid
+FNP_8_1035_1_original.mid
+FNP_8_1127_0_original.mid
+FNP_8_1251_6_original.mid
+FNP_8_1450_1_original.mid
+FNP_8_1467_0_original.mid
+FNP_8_1505_4_original.mid
+FNP_8_1556_3_original.mid
+FNP_8_321_2_original.mid
+FNP_8_499_3_original.mid
+FNP_8_504_1_original.mid
+FNP_8_756_0_original.mid
+FNP_8_876_1_original.mid
+FNP_8_97_1_original.mid
+FNP_8_973_5_original.mid
+FNP_8_994_3_original.mid
+FNP_9_232_11_original.mid
+FNP_9_345_1_original.mid
+FNP_9_622_1_original.mid
+FNP_9_673_1_original.mid
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Data/Midi/FiveNotePhrases/pfilelist.txt Thu Nov 25 11:10:53 2010 +0000
@@ -0,0 +1,1 @@
+FNP_10_144_1_original.mid
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Data/Midi/hymns/filelist.txt Thu Nov 25 11:10:53 2010 +0000
@@ -0,0 +1,37 @@
+hymn_004A_b.mid 9 28
+hymn_007_b.mid 10 23 34 41
+hymn_023A_b.mid 14 25
+hymn_025_b.mid 10 18 27 39
+hymn_046A_b.mid 15 25 38
+hymn_047_b.mid 10 19 29
+hymn_048bA_b.mid 10 20
+hymn_054_b.mid 11 19 27
+hymn_291_b.mid 9 20 30
+hymn_295_b.mid 12 20 29
+hymn_311_b.mid 12 21 33 41
+hymn_542_b.mid 9 19 27
+hymn_565_b.mid 9 20 28
+hymn_039_b.mid 10 21 31
+hymn_076_b.mid 9 18 26
+hymn_092_b.mid 13 22 30
+hymn_161_b.mid 10 19 29
+hymn_296_b.mid 10 19 26 37
+hymn_322A_b.mid 7 22 29
+hymn_327A_b.mid 9 19 28
+hymn_334aA_b.mid 9 21
+hymn_365_b.mid 7 23 32 45
+hymn_372A_b.mid 17 28 35 46
+hymn_389aA_b.mid 12 20 31 42
+hymn_512bA_b.mid 8 17 30
+hymn_581A_b.mid 8 18 27
+hymn_163_b.mid 9 18 27
+hymn_190_b.mid 8 17 28 41
+hymn_213_b.mid 10 19 30
+hymn_273_b.mid 9 19 27
+hymn_199A_b.mid 8 17 28
+hymn_200A_b.mid 13 23
+hymn_207_b.mid 9 27 38 46 55
+hymn_233_b.mid 11 18 30
+hymn_242A_b.mid 11 29
+hymn_267_b.mid 7 27 44 53
+hymn_288_b.mid 16 32 43
Binary file Data/Midi/hymns/hymn_002bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_004A_b.mid has changed
Binary file Data/Midi/hymns/hymn_007_b.mid has changed
Binary file Data/Midi/hymns/hymn_013A_b.mid has changed
Binary file Data/Midi/hymns/hymn_022_b.mid has changed
Binary file Data/Midi/hymns/hymn_023A_b.mid has changed
Binary file Data/Midi/hymns/hymn_025_b.mid has changed
Binary file Data/Midi/hymns/hymn_032A_b.mid has changed
Binary file Data/Midi/hymns/hymn_039_b.mid has changed
Binary file Data/Midi/hymns/hymn_044_b.mid has changed
Binary file Data/Midi/hymns/hymn_046A_b.mid has changed
Binary file Data/Midi/hymns/hymn_047_b.mid has changed
Binary file Data/Midi/hymns/hymn_048bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_050A_b.mid has changed
Binary file Data/Midi/hymns/hymn_053A_b.mid has changed
Binary file Data/Midi/hymns/hymn_054_b.mid has changed
Binary file Data/Midi/hymns/hymn_057bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_063A_b.mid has changed
Binary file Data/Midi/hymns/hymn_071A_b.mid has changed
Binary file Data/Midi/hymns/hymn_073_b.mid has changed
Binary file Data/Midi/hymns/hymn_074bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_076_b.mid has changed
Binary file Data/Midi/hymns/hymn_078A_b.mid has changed
Binary file Data/Midi/hymns/hymn_080A_b.mid has changed
Binary file Data/Midi/hymns/hymn_081_b.mid has changed
Binary file Data/Midi/hymns/hymn_083A_b.mid has changed
Binary file Data/Midi/hymns/hymn_088A_b.mid has changed
Binary file Data/Midi/hymns/hymn_090A_b.mid has changed
Binary file Data/Midi/hymns/hymn_092_b.mid has changed
Binary file Data/Midi/hymns/hymn_093A_b.mid has changed
Binary file Data/Midi/hymns/hymn_095bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_096bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_106bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_109A_b.mid has changed
Binary file Data/Midi/hymns/hymn_119_b.mid has changed
Binary file Data/Midi/hymns/hymn_121A_b.mid has changed
Binary file Data/Midi/hymns/hymn_122A_b.mid has changed
Binary file Data/Midi/hymns/hymn_124a_b.mid has changed
Binary file Data/Midi/hymns/hymn_127_b.mid has changed
Binary file Data/Midi/hymns/hymn_128A_b.mid has changed
Binary file Data/Midi/hymns/hymn_142A_b.mid has changed
Binary file Data/Midi/hymns/hymn_144A_b.mid has changed
Binary file Data/Midi/hymns/hymn_146A_b.mid has changed
Binary file Data/Midi/hymns/hymn_149A_b.mid has changed
Binary file Data/Midi/hymns/hymn_150A_b.mid has changed
Binary file Data/Midi/hymns/hymn_151bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_159A_b.mid has changed
Binary file Data/Midi/hymns/hymn_161_b.mid has changed
Binary file Data/Midi/hymns/hymn_163_b.mid has changed
Binary file Data/Midi/hymns/hymn_165A_b.mid has changed
Binary file Data/Midi/hymns/hymn_169A_b.mid has changed
Binary file Data/Midi/hymns/hymn_181A_b.mid has changed
Binary file Data/Midi/hymns/hymn_187A_b.mid has changed
Binary file Data/Midi/hymns/hymn_189aA_b.mid has changed
Binary file Data/Midi/hymns/hymn_190_b.mid has changed
Binary file Data/Midi/hymns/hymn_192A_b.mid has changed
Binary file Data/Midi/hymns/hymn_198A_b.mid has changed
Binary file Data/Midi/hymns/hymn_199A_b.mid has changed
Binary file Data/Midi/hymns/hymn_200A_b.mid has changed
Binary file Data/Midi/hymns/hymn_207_b.mid has changed
Binary file Data/Midi/hymns/hymn_213_b.mid has changed
Binary file Data/Midi/hymns/hymn_218A_b.mid has changed
Binary file Data/Midi/hymns/hymn_227A_b.mid has changed
Binary file Data/Midi/hymns/hymn_229A_b.mid has changed
Binary file Data/Midi/hymns/hymn_232A_b.mid has changed
Binary file Data/Midi/hymns/hymn_233_b.mid has changed
Binary file Data/Midi/hymns/hymn_242A_b.mid has changed
Binary file Data/Midi/hymns/hymn_262A_b.mid has changed
Binary file Data/Midi/hymns/hymn_267_b.mid has changed
Binary file Data/Midi/hymns/hymn_272aA_b.mid has changed
Binary file Data/Midi/hymns/hymn_273_b.mid has changed
Binary file Data/Midi/hymns/hymn_287A_b.mid has changed
Binary file Data/Midi/hymns/hymn_288_b.mid has changed
Binary file Data/Midi/hymns/hymn_291_b.mid has changed
Binary file Data/Midi/hymns/hymn_295_b.mid has changed
Binary file Data/Midi/hymns/hymn_296_b.mid has changed
Binary file Data/Midi/hymns/hymn_306A_b.mid has changed
Binary file Data/Midi/hymns/hymn_310A_b.mid has changed
Binary file Data/Midi/hymns/hymn_311_b.mid has changed
Binary file Data/Midi/hymns/hymn_316A_b.mid has changed
Binary file Data/Midi/hymns/hymn_317A_b.mid has changed
Binary file Data/Midi/hymns/hymn_318A_b.mid has changed
Binary file Data/Midi/hymns/hymn_322A_b.mid has changed
Binary file Data/Midi/hymns/hymn_325aA_b.mid has changed
Binary file Data/Midi/hymns/hymn_325bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_327A_b.mid has changed
Binary file Data/Midi/hymns/hymn_333A_b.mid has changed
Binary file Data/Midi/hymns/hymn_334aA_b.mid has changed
Binary file Data/Midi/hymns/hymn_335A_b.mid has changed
Binary file Data/Midi/hymns/hymn_338A_b.mid has changed
Binary file Data/Midi/hymns/hymn_361A_b.mid has changed
Binary file Data/Midi/hymns/hymn_365_b.mid has changed
Binary file Data/Midi/hymns/hymn_372A_b.mid has changed
Binary file Data/Midi/hymns/hymn_387bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_388b_b.mid has changed
Binary file Data/Midi/hymns/hymn_389aA_b.mid has changed
Binary file Data/Midi/hymns/hymn_398A_b.mid has changed
Binary file Data/Midi/hymns/hymn_412A_b.mid has changed
Binary file Data/Midi/hymns/hymn_434A_b.mid has changed
Binary file Data/Midi/hymns/hymn_436A_b.mid has changed
Binary file Data/Midi/hymns/hymn_439A_b.mid has changed
Binary file Data/Midi/hymns/hymn_440A_b.mid has changed
Binary file Data/Midi/hymns/hymn_443A_b.mid has changed
Binary file Data/Midi/hymns/hymn_444_b.mid has changed
Binary file Data/Midi/hymns/hymn_464A_b.mid has changed
Binary file Data/Midi/hymns/hymn_470A_b.mid has changed
Binary file Data/Midi/hymns/hymn_471A_b.mid has changed
Binary file Data/Midi/hymns/hymn_475A_b.mid has changed
Binary file Data/Midi/hymns/hymn_485_b.mid has changed
Binary file Data/Midi/hymns/hymn_512bA_b.mid has changed
Binary file Data/Midi/hymns/hymn_526_b.mid has changed
Binary file Data/Midi/hymns/hymn_540A_b.mid has changed
Binary file Data/Midi/hymns/hymn_542_b.mid has changed
Binary file Data/Midi/hymns/hymn_543A_b.mid has changed
Binary file Data/Midi/hymns/hymn_545A_b.mid has changed
Binary file Data/Midi/hymns/hymn_548A_b.mid has changed
Binary file Data/Midi/hymns/hymn_563A_b.mid has changed
Binary file Data/Midi/hymns/hymn_565_b.mid has changed
Binary file Data/Midi/hymns/hymn_581A_b.mid has changed
Binary file Data/Midi/hymns/hymn_628A_b.mid has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Data/Midi/hymns/pfilelist.txt Thu Nov 25 11:10:53 2010 +0000
@@ -0,0 +1,2 @@
+hymn_092_b.mid 13 31
+hymn_296_b.mid 20 45
Binary file Data/Midi/misc/Gradus.mid has changed
Binary file Data/Midi/misc/chorale151.mid has changed
Binary file Data/Midi/misc/chorale61.mid has changed
Binary file Data/Midi/misc/two-pages.mid has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Data/instructions.html Thu Nov 25 11:10:53 2010 +0000
@@ -0,0 +1,43 @@
+<html>
+<body>
+
+<font size="+1" face="sans">
+
+<p>This experiment will consist of 28 short melodies presented in two
+blocks. The first block contains 2 practice trials for you to
+familiarise yourself with the programme. After the practice block, you
+will be able to adjust the volume to a comfortable level and ask any
+questions you may have. The main part of the experiment will follow on
+from the pracice block.</p>
+
+<p>When each melody starts playing, a cross will appear in the centre
+of the screen. You should focus on this cross while listening to the
+melody.</p>
+
+<p>Whilst listening to each melody, you will be prompted to judge how
+expected or unexpected you find a given note. Shortly before such
+notes, the cross will be replaced by a clock with a minute hand at 12
+O'Clock. The hand will count down in time with the music. The note
+whose onset coincides with the hand returning to 12 O'Clock is the one
+you should respond to. </p>
+
+<p>You should judge how expected or unexpected you find a given note
+in the preceding context of the melody using a scale of 1 (highly
+unexpected) to 7 (highly expected). Please try to use the full range
+of the scale.</p>
+
+<p>The music will continue to play, so try to respond as quickly as
+possible, however accuracy is more vital than speed. There is only one
+chance to make your decision, once selected it cannot be
+changed. Before making your judgement, try to keep the mouse pointer
+in the midrange of the scale (i.e., 4).</p>
+
+<p>After listening to each melody, you will be required to answer some
+short questions relating to the music before listening to the next
+piece.</p>
+
+<p>If you have any questions please ask now. Otherwise, press
+'Continue' to move directly to the practice block</p>
+
+</body>
+</html>
--- a/Experiment.java Thu Nov 18 11:47:32 2010 +0000
+++ b/Experiment.java Thu Nov 25 11:10:53 2010 +0000
@@ -2,7 +2,7 @@
* File: Experiment.java
* Author: Marcus Pearce <m.pearce@gold.ac.uk>
* Created: <2007-02-14 11:28:27 marcusp>
- * Time-stamp: <2010-11-18 10:55:16 marcusp>
+ * Time-stamp: <2010-11-25 10:48:00 marcusp>
*=============================================================================
*/
--- a/ExperimentController.java Thu Nov 18 11:47:32 2010 +0000
+++ b/ExperimentController.java Thu Nov 25 11:10:53 2010 +0000
@@ -2,7 +2,7 @@
* File: ExperimentController.java
* Author: Marcus Pearce <m.pearce@gold.ac.uk>
* Created: <2007-12-14 12:06:10 marcusp>
- * Time-stamp: <2010-11-18 11:04:51 marcusp>
+ * Time-stamp: <2010-11-25 11:09:56 marcusp>
*=============================================================================
*/
@@ -159,16 +159,25 @@
sp = gui.getStimulusPanel();
JButton[] rButtons = sp.getResponseButtons();
- for (int i = 0; i < rButtons.length; i++) {
- if ((exp.isRunning() || exp.hasRun()) && gui.getAcceptingResponses()) {
- //System.out.println("Char = " + Character.forDigit(i+1, 10));
- if (e.getKeyChar() == Character.forDigit(i+1, 10)) {
- //System.out.println("Got rating: " + (i + 1));
- block.addResponse(i+1, time);
- gui.setAcceptingResponses(false);
+ if ((exp.isRunning() || exp.hasRun()) && gui.getAcceptingResponses()) {
+ if (exp.getScaleLength() == 2) {
+ char key = e.getKeyChar();
+ switch(key) {
+ case 'q': block.addResponse(1, time); break;
+ case 'p': block.addResponse(2, time); break;
+ default: System.out.println("No Response at " + time); break;
}
- //else
- // block.addResponse(0, time);
+ } else {
+ for (int i = 0; i < rButtons.length; i++) {
+ //System.out.println("Char = " + Character.forDigit(i+1, 10));
+ if (e.getKeyChar() == Character.forDigit(i+1, 10)) {
+ //System.out.println("Got rating: " + (i + 1));
+ block.addResponse(i+1, time);
+ gui.setAcceptingResponses(false);
+ }
+ //else
+ // block.addResponse(0, time);
+ }
}
}
}
