[virtualcommons-svn] commit/foraging: alllee: updating imposed strategy instructions

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

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/7fb3d9c08846/
changeset:   7fb3d9c08846
user:        alllee
date:        2012-03-07 09:52:52
summary:     updating imposed strategy instructions
affected #:  3 files

diff -r d572fcd98734afe5bf746264acab8c548bd1f71d -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
--- a/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
+++ b/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
@@ -735,7 +735,6 @@
         ST template = createStringTemplate(getVotingResultsTemplate());
         template.add("nominations", sortedNominations);
         template.add("tiebreaker", selectedRules.size() > 1);
-        template.add("selectedRules", selectedRules);
         return template.render();
     }
 


diff -r d572fcd98734afe5bf746264acab8c548bd1f71d -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 src/main/resources/configuration/iu/2011/imposed-punish/server.xml
--- a/src/main/resources/configuration/iu/2011/imposed-punish/server.xml
+++ b/src/main/resources/configuration/iu/2011/imposed-punish/server.xml
@@ -274,7 +274,7 @@
     {if (tiebreaker)}
     <p><b>NOTE:</b> There was a tie and the selected strategy listed here was randomly selected as the winner.</p>
     {endif}
-    <p><b> {first(selectedRules)} </b></p>
+    <p><b> {first(self.selectedRules)} </b></p>
     ]]></entry>
 
@@ -326,14 +326,14 @@
 {if (self.imposedStrategyEnabled)}
 <h1>Strategies</h1><hr>
-    <p>You now have the opportunity to consider {self.foragingStrategies.size}
-        possible strategies for managing how you and the other members of your group
-        collect tokens for the rest of the experiment.
+    <p>Below is a list of {self.foragingStrategies.size} strategies, or options, for managing how you and the other
+        members of your group collect tokens for the rest of the experiment.
+    <p>
+        Please read and consider the list of options carefully. Press "Submit" once you have finished reviewing the
+        strategies.
     </p>
-    <p>
-        Below is the list of different strategies.  Please read the list carefully.
-        Press "Submit" once you have finished reviewing the strategies.
-    </p>
+    <p><b>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>
+
 {else}
 <h1>Strategy Nomination Instructions</h1><hr>
@@ -357,8 +357,11 @@
     {if (self.imposedStrategyEnabled)}
     <h1>The Assigned Strategy</h1><hr>
-        <p>Your group has been assigned the following strategy.  Every member in your group is being notified of the same strategy.</p>
+        <p>Your group has been assigned the following strategy.  Every member of your group is being notified of the same strategy.</p><p><b> {first(self.selectedRules)} </b></p>
+    <h2>Implementation</h2>
+    <hr>
+        <p>Neither the computer nor the experimenter will intervene to implement the strategy. </p>
 
     {else}
     <h1>Submitted</h1>


diff -r d572fcd98734afe5bf746264acab8c548bd1f71d -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 src/main/resources/configuration/iu/2011/imposed/server.xml
--- a/src/main/resources/configuration/iu/2011/imposed/server.xml
+++ b/src/main/resources/configuration/iu/2011/imposed/server.xml
@@ -274,18 +274,10 @@
     {if (tiebreaker)}
     <p><b>NOTE:</b> There was a tie and the selected strategy listed here was randomly selected as the winner.</p>
     {endif}
-    <p><b> {first(selectedStrategies)} </b></p>
-    <h2>Implementation</h2>
-    <hr>
-        <p>
-            Neither the computer, nor the experimenter will intervene to implement the
-            strategy.
-        </p>
-        <p><b>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>
+    <p><b> {first(self.selectedRules)} </b></p>
     ]]></entry>
+
 <entry key='initial-voting-instructions'><![CDATA[
 <h1>Important New Instructions!</h1>
@@ -329,20 +321,19 @@
 <p>Please wait while the other participants complete their tasks.</p>
 ]]></entry>
-
 <entry key='voting-instructions'><![CDATA[
 {if (self.imposedStrategyEnabled)}
 <h1>Strategies</h1><hr>
-    <p>You now have the opportunity to consider {self.foragingStrategies.size}
-        possible strategies for managing how you and the other members of your group
-        collect tokens for the rest of the experiment.
+    <p>Below is a list of {self.foragingStrategies.size} strategies, or options, for managing how you and the other
+        members of your group collect tokens for the rest of the experiment.
+    <p>
+        Please read and consider the list of options carefully. Press "Submit" once you have finished reviewing the
+        strategies.
     </p>
-    <p>
-        Below is the list of different strategies.  Please read the list carefully.
-        Press "Submit" once you have finished reviewing the strategies.
-    </p>
+    <p><b>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>
+
 {else}
 <h1>Strategy Nomination Instructions</h1><hr>
@@ -361,14 +352,16 @@
 {endif}
 ]]></entry>
-
 <entry key='submitted-vote-instructions'><![CDATA[
     {if (self.imposedStrategyEnabled)}
     <h1>The Assigned Strategy</h1><hr>
-        <p>Your group has been assigned the following strategy.  Every member in your group is being notified of the same strategy.</p>
+        <p>Your group has been assigned the following strategy.  Every member of your group is being notified of the same strategy.</p><p><b> {first(self.selectedRules)} </b></p>
+    <h2>Implementation</h2>
+    <hr>
+        <p>Neither the computer nor the experimenter will intervene to implement the strategy. </p>
 
     {else}
     <h1>Submitted</h1>

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.