Mercurial > hg > mep

changeset 2:1fe7ac28a3ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Save results after each presentation. Ignore-this: 5f7d744b55a2f8919f7807bf69fa3d1a
author Marcus Pearce <m.pearce@gold.ac.uk>
date Mon, 14 Jun 2010 13:28:18 +0100
parents 93ed757b9871
children 6108a8aa9d82
files ExperimentController.java MelodyResults.java SubjectResults.java
diffstat 3 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ExperimentController.java	Tue Jun 08 17:30:07 2010 +0100
+++ b/ExperimentController.java	Mon Jun 14 13:28:18 2010 +0100
@@ -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-05-18 10:51:31 marcusp>
+ * Time-stamp: <2010-06-14 13:20:03 marcusp>
  *=============================================================================
  */
 
@@ -108,12 +108,13 @@
             else if (sp.unansweredQuestions())
                 reportError("There are unanswered questions."); 
             else {  
-                // store results 
+                // store results (and write to file)
                 String answer1 = (String)(sp.getQ1Box().getSelectedItem()); 
                 String answer2 = (String)(sp.getQ2Box().getSelectedItem()); 
                 block.addMelodyQA("known", answer1); 
                 block.addMelodyQA("liked", answer2); 
-                block.storeMelodyResult(); 
+                block.storeMelodyResult();
+                results.writeResults();
                 // proceed to ... 
                 String nextFile = block.nextFile();
                 if (nextFile == null) { 
--- a/MelodyResults.java	Tue Jun 08 17:30:07 2010 +0100
+++ b/MelodyResults.java	Mon Jun 14 13:28:18 2010 +0100
@@ -2,7 +2,7 @@
  * File:       MelodyResults.java
  * Author:     Marcus Pearce <m.pearce@gold.ac.uk>
  * Created:    <2007-02-14 11:28:27 marcusp>
- * Time-stamp: <2010-05-10 11:38:52 marcusp>
+ * Time-stamp: <2010-06-14 13:00:50 marcusp>
  *=============================================================================
  */
 
@@ -72,10 +72,10 @@
         answers.add(answer); 
     }
 
-    public void writeResults(File outputFile, boolean header) { 
+    public void writeResults(File outputFile, boolean header, boolean append) { 
 	Writer writer = null;
         try {
-            writer = new FileWriter (outputFile, true);
+            writer = new FileWriter (outputFile, append);
         } catch (IOException e) {
             System.out.println("Could not write file: " + outputFile.getPath());
             return;
--- a/SubjectResults.java	Tue Jun 08 17:30:07 2010 +0100
+++ b/SubjectResults.java	Mon Jun 14 13:28:18 2010 +0100
@@ -2,7 +2,7 @@
  * File:       SubjectResults.java
  * Author:     Marcus Pearce <m.pearce@gold.ac.uk>
  * Created:    <2007-12-12 10:44:12 marcusp>
- * Time-stamp: <2007-12-17 11:49:35 marcusp>
+ * Time-stamp: <2010-06-14 13:11:36 marcusp>
  *=============================================================================
  */
 
@@ -42,12 +42,15 @@
 
     public void writeResults() { 
         Iterator ri = results.iterator(); 
-        boolean header = true; 
+        boolean header = true;
+        boolean append = false;
         while (ri.hasNext()) { 
             MelodyResults mResult = (MelodyResults)ri.next(); 
-            mResult.writeResults(outputFile, header); 
-            if (header) 
+            mResult.writeResults(outputFile, header, append); 
+            if (header) {
                 header = false; 
+                append = true;
+            }
         }
     }