[virtualcommons-svn] commit/foraging: alllee: merging vote treatment configuration fixes from default -> stable

[Bitbucket <com...@bi...>]

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/570cb75dcb0c/
changeset:   570cb75dcb0c
branch:      stable
user:        alllee
date:        2012-01-31 06:17:46
summary:     merging vote treatment configuration fixes from default -> stable
affected #:  4 files

diff -r 1dfe234f466011215ddca77824e49f728aa939f4 -r 570cb75dcb0c7feeabcb03b238ddc0155250f92e src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java
--- a/src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java
+++ b/src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java
@@ -19,7 +19,7 @@
 import edu.asu.commons.util.Utils;
 
 /**
- * $Id: SummaryProcessor.java 526 2010-08-06 01:25:27Z alllee $
+ * $Id$
  * 
  * 
  * @author <a href='mailto:all...@as...'>Allen Lee</a>
@@ -41,7 +41,7 @@
             	}
             });
             for (ClientData data : clientDataList) {
-                clientTokens.add(String.format("%s, %s, %s", data.getId(), data.getAssignedNumber(), data.getTotalTokens()));
+                clientTokens.add(String.format("%s, %s", data, data.getTotalTokens()));
                 totalConsumedGroupTokens += data.getTotalTokens();
             }
             writer.println(
@@ -84,4 +84,4 @@
     public String getOutputFileExtension() {
         return "-summary.txt";
     }
-}
\ No newline at end of file
+}


diff -r 1dfe234f466011215ddca77824e49f728aa939f4 -r 570cb75dcb0c7feeabcb03b238ddc0155250f92e src/main/java/edu/asu/commons/foraging/model/ClientData.java
--- a/src/main/java/edu/asu/commons/foraging/model/ClientData.java
+++ b/src/main/java/edu/asu/commons/foraging/model/ClientData.java
@@ -600,7 +600,13 @@
     }
 
     public String toString() {
-        return String.format("[%s #%d]", id, assignedNumber);
+        String surveyId = id.getSurveyId();
+        if (surveyId == null || surveyId.trim().isEmpty()) {
+            return String.format("%s, #%d", id, assignedNumber);
+        }
+        else {
+            return String.format("%s, Survey id: %s, #%d", id, surveyId, assignedNumber);
+        }
     }
 
     public void addTrustGameEarnings(double trustGameEarnings) {


diff -r 1dfe234f466011215ddca77824e49f728aa939f4 -r 570cb75dcb0c7feeabcb03b238ddc0155250f92e src/main/resources/configuration/iu/2011/vote/round4.xml
--- a/src/main/resources/configuration/iu/2011/vote/round4.xml
+++ b/src/main/resources/configuration/iu/2011/vote/round4.xml
@@ -35,79 +35,6 @@
     ]]></entry>
 
-<entry key='voting-results'>
-    <![CDATA[
-    <h1>Nomination Results</h1>
-    <h2>Selected Strategy</h2>
-    <hr>
-    <p><b> {first(selectedRules)} </b></p>
-    {if (tiebreaker)}
-    <p><b>NOTE:</b> There was a tie and the selected strategy listed here was randomly selected as the winner.</p>
-    <h2>Other Nominated Strategies</h2>
-    <hr>
-        <ol>
-            {rest(selectedRules): {selectedRule | <li><b>{selectedRule}</b></li>}}
-        </ol>
-    {endif}
-    ]]>
-</entry>
-
-<entry key='initial-voting-instructions'>
-    <![CDATA[
-<h1>Important New Instructions!</h1>
-<h2>Strategies for managing how players collect tokens for the rest of the experiment</h2>
-<hr>
-<p>
-In a moment, you will have the option to implement one of five strategies for how you
-and the three other people in your group collect tokens for the rest of the
-experiment.
-</p>
-
-<h2>Procedure for Deciding the Strategy</h2>
-<hr>
-<p>
-    Each of the {self.clientsPerGroup} people in your group can nominate one of the five
-    potential strategies.  The single strategy that receives the most nominations
-    wins.
-</p>
-<p>
-    <b>If there is a tie</b>, one of the tied options will be selected at random by
-    the computer.  Each of the tied strategies will have an equal chance of being
-    selected.
-</p>
-
-<h2>Implementation</h2>
-<hr>
-    <p>Neither the computer nor the experimenter will intervene to implement the
-        strategy.
-    </p>
-
-    <p>
-        <b>Do you have any questions?</b>  If you have any questions at this time,
-        raise your hand and someone will come over to your station and answer it.
-    </p>
-    ]]>
-</entry>
-
-
-<entry key='voting-instructions'>
-<![CDATA[
-<h1>Strategy Nomination Instructions</h1>
-<hr>
-<p>
-To nominate a strategy, click the radio button that is to the right of the one you choose; then click "submit". The computer will tally the nominations and then report the
-results on the next screen. The results will be presented to each person in
-your group.
-</p>
-<h2>Your selection will be anonymous</h2>
-<hr>
-<p>
-The identity of people who nominated a particular strategy will NOT be revealed.
-Therefore, neither you nor the experimenter will know who nominated a particular
-strategy.
-</p>
-]]>
-</entry><entry key='external-survey-enabled'>true</entry><entry key='survey-url'>


diff -r 1dfe234f466011215ddca77824e49f728aa939f4 -r 570cb75dcb0c7feeabcb03b238ddc0155250f92e src/main/resources/configuration/iu/2011/vote/server.xml
--- a/src/main/resources/configuration/iu/2011/vote/server.xml
+++ b/src/main/resources/configuration/iu/2011/vote/server.xml
@@ -320,4 +320,23 @@
 ]]></entry>
 
+<entry key='voting-instructions'>
+<![CDATA[
+<h1>Strategy Nomination Instructions</h1>
+<hr>
+<p>
+To nominate a strategy, click the radio button that is to the right of the one you choose; then click "submit". The computer will tally the nominations and then report the
+results on the next screen. The results will be presented to each person in
+your group.
+</p>
+<h2>Your selection will be anonymous</h2>
+<hr>
+<p>
+The identity of people who nominated a particular strategy will NOT be revealed.
+Therefore, neither you nor the experimenter will know who nominated a particular
+strategy.
+</p>
+]]>
+</entry>
+
 </properties>

Repository URL: https://bitbucket.org/virtualcommons/foraging/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.