[virtualcommons-svn] commit/foraging: alllee: updating voting results template
Status: Beta
Brought to you by:
alllee
From: Bitbucket <com...@bi...> - 2012-01-11 20:19:20
|
1 new commit in foraging: https://bitbucket.org/virtualcommons/foraging/changeset/27a5a9748096/ changeset: 27a5a9748096 user: alllee date: 2012-01-11 21:19:13 summary: updating voting results template affected #: 4 files diff -r 49a442883dbaec38c07b09415eb478d4220cc61b -r 27a5a9748096161d031e7b57d24d78fa9c229190 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 @@ -558,7 +558,9 @@ } public String getInitialVotingInstructions() { - return getProperty("initial-voting-instructions", "<h1>Notice</h1><hr><p>You will be given the ability to vote for rules in the next screen.</p>"); + ST template = createStringTemplate(getProperty("initial-voting-instructions", "<h1>Notice</h1><hr><p>You will be given the ability to vote for rules in the next screen.</p>")); + template.add("clientsPerGroup", getClientsPerGroup()); + return template.render(); } public List<ForagingRule> getForagingRules() { @@ -729,7 +731,6 @@ ST template = createStringTemplate(getProperty("voting-results")); template.add("tiebreaker", selectedRules.size() > 1); template.add("selectedRules", selectedRules); - template.add("selectedRule", selectedRules.get(0)); return template.render(); /* StringBuilder builder = new StringBuilder("<h1>Voting Results</h1><hr>"); diff -r 49a442883dbaec38c07b09415eb478d4220cc61b -r 27a5a9748096161d031e7b57d24d78fa9c229190 src/main/java/edu/asu/commons/foraging/rules/ForagingRule.java --- a/src/main/java/edu/asu/commons/foraging/rules/ForagingRule.java +++ b/src/main/java/edu/asu/commons/foraging/rules/ForagingRule.java @@ -11,7 +11,9 @@ * @version $Rev$ */ public enum ForagingRule { - WAIT_ONE_MINUTE("Wait 60 seconds for the screen to fill up with tokens (the timer will have {remainingTime} left). Then everyone collects tokens for the remaining amount of time."), + // FIXME: hard coded for 4 minute rounds, but templatizing this text is a bit of overkill at the moment unless + // we move this over to the configuration. + WAIT_ONE_MINUTE("Wait 60 seconds for the screen to fill up with tokens (the timer will have 180 seconds left). Then everyone collects tokens for the remaining amount of time."), PRIVATE_PROPERTY("Players divide the field up into four equally-sized areas and can do whatever they want within their area. With four people, each person takes an area around one of the four corners."), LIMITED_COLLECTION_RATE("Each person collects tokens at a rate of 1 token every 4 seconds."), MAINTAIN_TOKEN_CLUSTERS("Players leave two tokens untouched when the tokens are in a cluster of three or more that surround an empty cell."), diff -r 49a442883dbaec38c07b09415eb478d4220cc61b -r 27a5a9748096161d031e7b57d24d78fa9c229190 src/main/resources/configuration/indiana-experiments/2011/vote-punish/round0.xml --- a/src/main/resources/configuration/indiana-experiments/2011/vote-punish/round0.xml +++ b/src/main/resources/configuration/indiana-experiments/2011/vote-punish/round0.xml @@ -23,14 +23,15 @@ <p> During the practice round, you will have {duration} to practice with the experimental environment. The decisions you make in this round will NOT - influence your earnings. At the beginning of the practice round a quarter of the - cells are occupied with green tokens. The environment is a {resourceWidth} x {resourceDepth} grid of cells. + influence your earnings. At the beginning of the practice round + {initialDistribution} of the cells are occupied with green tokens. The + environment is a {resourceWidth} x {resourceDepth} grid of cells. </p><p> During this practice round, and <b>only during</b> this practice round, you are able to reset the tokens displayed on the screen. When you push the <b>R</b> key -you will reset the distribution of the tokens to randomly occupying a quarter of the -cells with green tokens. +you will reset the distribution of the tokens to randomly occupying +{initialDistribution} of the cells with green tokens. </p><p><b>Do you have any questions?</b> If you have any questions at this time please raise your hand and someone will come over to your station and answer it.</p> ]]> diff -r 49a442883dbaec38c07b09415eb478d4220cc61b -r 27a5a9748096161d031e7b57d24d78fa9c229190 src/main/resources/configuration/indiana-experiments/2011/vote-punish/round4.xml --- a/src/main/resources/configuration/indiana-experiments/2011/vote-punish/round4.xml +++ b/src/main/resources/configuration/indiana-experiments/2011/vote-punish/round4.xml @@ -15,11 +15,46 @@ <entry key='voting-enabled'>true</entry><entry key="instructions"><![CDATA[ + <h1>Important New Instructions</h1> + <h2>Reducing Other Player's Earnings</h2> + <hr><p> - Round {roundNumber} is about to begin. You have the option to reduce the - earnings of another participant at a cost to your own earnings by typing that - participants' number key from 1 to {clientsPerGroup}. +Round {roundNumber} is about to begin. You have the option to reduce the +earnings of another participant at a cost to your own earnings by typing that +participants' number key from 1 to {clientsPerGroup}. </p> + <ul> + <li>Each player in your group has a number from 1 to {clientsPerGroup}. If + you press a number key 1-{clientsPerGroup}, you will reduce the number + of tokens that player has collected during the round by + {sanctionPenalty} tokens. This will also reduce your own token amount by + {sanctionCost} token. The decision whether or when to use this option is + up to you. + </li> + <li>When you reduce the number of tokens of another participant, they will + receive a message stating that you have reduced their tokens. Likewise, if + another participant reduces your number of tokens, you will also receive a + message. These messages will be displayed on the bottom of your screen. + </li> + <li>If your tokens are being reduced or you are reducing another participant's + tokens, you will receive some visual cues. When your tokens are being reduced + your yellow dot will turn red briefly with a blue background. The participant + currently reducing your tokens will turn purple with a white background. + </li> + <li>You may reduce the earnings of other participants as long as (1) there are + tokens remaining on the screen and (2) both you and the other participant + have a positive number of tokens collected during the round. <b>Each time</b> + you press the numeric key corresponding to another participant your token + amount is reduced by <b>{sanctionCost}</b>, and their token amount is reduced by + <b>{sanctionPenalty}</b>. + </li> + </ul> +<h2>Strategy Reminder</h2> +<hr> + <p> + {selectedStrategy} + </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. @@ -27,6 +62,23 @@ ]]></entry> +<entry key='voting-results'> + <![CDATA[ + <h1>Voting Results</h1> + <h2>Selected Strategy</h2> + <hr> + <p><b> {first(selectedRules)} </b></p> + {if (tiebreaker)} + <p><b>NOTE:</b> There was a tie and 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> @@ -78,7 +130,7 @@ <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 -rule. +strategy. </p> ]]></entry> @@ -95,53 +147,17 @@ </p> ]]></entry> - <entry key='survey-url'><![CDATA[ https://qtrial.qualtrics.com/SE/?SID=SV_cLX7jnYikmD9eSM ]]></entry> - <entry key='sanction-type'>real-time</entry><entry key="sanction-cost">1</entry><entry key="sanction-multiplier">2</entry><entry key='sanction-instructions'><![CDATA[ - <h1>Important New Instructions</h1> - <h2>Reducing Other Player's Earnings</h2> - <hr> -<p> -Beginning with the upcoming round you will have the option to reduce the earnings of -another participant at a cost to your own earnings. -</p> - <ul> - <li>Each player in your group has a number from 1 to {clientsPerGroup}. If - you press a number key 1-{clientsPerGroup}, you will reduce the number - of tokens that player has collected during the round by - {sanctionPenalty} tokens. This will also reduce your own token amount by - {sanctionCost} token. The decision whether or when to use this option is - up to you. - </li> - <li>When you reduce the number of tokens of another participant, they will - receive a message stating that you have reduced their tokens. Likewise, if - another participant reduces your number of tokens, you will also receive a - message. These messages will be displayed on the bottom of your screen. - </li> - <li>If your tokens are being reduced or you are reducing another participant's - tokens, you will receive some visual cues. When your tokens are being reduced - your yellow dot will turn red briefly with a blue background. The participant - currently reducing your tokens will turn purple with a white background. - </li> - <li>You may reduce the earnings of other participants as long as (1) there are - tokens remaining on the screen and (2) both you and the other participant - have a positive number of tokens collected during the round. <b>Each time</b> - you press the numeric key corresponding to another participant your token - amount is reduced by <b>{sanctionCost}</b>, and their token amount is reduced by - <b>{sanctionPenalty}</b>. - </li> - </ul> ]]></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. |