[virtualcommons-svn] commit/foraging: alllee: adjusting resource size in configuration files, addin
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/foraging: alllee: adjusting resource size in configuration files, adding fixed rules for voting
|
From: Bitbucket <com...@bi...> - 2011-09-29 10:48:56
|
1 new changeset in foraging: http://bitbucket.org/virtualcommons/foraging/changeset/fb8379345ce6/ changeset: fb8379345ce6 user: alllee date: 2011-09-29 12:48:47 summary: adjusting resource size in configuration files, adding fixed rules for voting condition affected #: 10 files (-1 bytes) --- a/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java Wed Sep 28 21:03:30 2011 -0700 +++ b/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java Thu Sep 29 03:48:47 2011 -0700 @@ -44,6 +44,15 @@ private static final double DEFAULT_TOKEN_BIRTH_PROBABILITY = 0.01d; + private final static List<String> FIXED_RULES = Arrays.asList( + "Wait 2 minutes for the screen to fill up with green tokens. Then everyone collect tokens for the remaining amount of time.", + "Each person gets a set area within which they can do whatever they want with the green tokens. With four people, each person gets one of the four corners.", + "Each person collects green tokens at a certain rate: 1 token every 3 seconds (i.e., count to 3 between each token you collect).", + "When someone collects from a cluster of green tokens (i.e., 3 or more tokens that are touching each other) that person leaves at least 2 tokens touching each other.", + "Collect green tokens until only about 10 are left; at that point, everyone must wait at least 1 minute before collecting any more tokens.", + "No rule (Everyone can do whatever they want)." + ); + public double getTrustGamePayoffIncrement() { return getDoubleProperty("trust-game-payoff", 0.25d); } @@ -514,6 +523,14 @@ return getBooleanProperty("rotating-monitor-enabled", false); } + public boolean isVotingEnabled() { + return getBooleanProperty("voting-enabled"); + } + + public List<String> getFixedRules() { + return FIXED_RULES; + + } public boolean isVotingAndRegulationEnabled() { return getBooleanProperty("voting-and-regulation-enabled", false); } @@ -637,7 +654,7 @@ @Override public String toString() { List<RoundConfiguration> allParameters = getParentConfiguration().getAllParameters(); - return String.format("Round %d of %d -- %s", allParameters.indexOf(this) + 1, allParameters.size(), getProperties()); + return String.format("Round %d of %d\n\t%s", allParameters.indexOf(this) + 1, allParameters.size(), getProperties()); } } --- a/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round1.xml Wed Sep 28 21:03:30 2011 -0700 +++ b/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round1.xml Thu Sep 29 03:48:47 2011 -0700 @@ -5,8 +5,8 @@ <entry key="display-group-tokens">true</entry><entry key="clients-per-group">4</entry><entry key="duration">240</entry> -<entry key="resource-depth">29</entry> -<entry key="resource-width">29</entry> +<entry key="resource-depth">26</entry> +<entry key="resource-width">26</entry><entry key='always-explicit'>true</entry><entry key='max-cell-occupancy'>1</entry> --- a/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round2.xml Wed Sep 28 21:03:30 2011 -0700 +++ b/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round2.xml Thu Sep 29 03:48:47 2011 -0700 @@ -5,8 +5,8 @@ <entry key="display-group-tokens">true</entry><entry key="clients-per-group">4</entry><entry key="duration">240</entry> -<entry key="resource-depth">29</entry> -<entry key="resource-width">29</entry> +<entry key="resource-depth">26</entry> +<entry key="resource-width">26</entry><!-- enable field of vision for tokens and subjects --> --- a/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round3.xml Wed Sep 28 21:03:30 2011 -0700 +++ b/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round3.xml Thu Sep 29 03:48:47 2011 -0700 @@ -5,8 +5,8 @@ <entry key="display-group-tokens">true</entry><entry key="clients-per-group">4</entry><entry key="duration">240</entry> -<entry key="resource-depth">29</entry> -<entry key="resource-width">29</entry> +<entry key="resource-depth">26</entry> +<entry key="resource-width">26</entry><entry key='always-explicit'>true</entry><entry key='max-cell-occupancy'>1</entry> --- a/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round4.xml Wed Sep 28 21:03:30 2011 -0700 +++ b/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round4.xml Thu Sep 29 03:48:47 2011 -0700 @@ -4,8 +4,8 @@ <comment>Foraging XML-ized experiment round configuration</comment><entry key="display-group-tokens">true</entry><entry key="clients-per-group">4</entry> -<entry key="resource-depth">29</entry> -<entry key="resource-width">29</entry> +<entry key="resource-depth">26</entry> +<entry key="resource-width">26</entry><entry key="duration">240</entry><entry key='always-explicit'>true</entry> --- a/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round5.xml Wed Sep 28 21:03:30 2011 -0700 +++ b/src/main/resources/configuration/indiana-experiments/fall-2011/pretest/round5.xml Thu Sep 29 03:48:47 2011 -0700 @@ -4,15 +4,14 @@ <comment>Foraging XML-ized experiment round configuration</comment><entry key="display-group-tokens">true</entry><entry key="clients-per-group">4</entry> -<entry key="resource-depth">29</entry> -<entry key="resource-width">29</entry> +<entry key="resource-depth">26</entry> +<entry key="resource-width">26</entry><entry key="duration">240</entry><entry key="initial-distribution">.25</entry><entry key='always-explicit'>true</entry><entry key='max-cell-occupancy'>1</entry> -<entry key="in-round-chat-enabled">true</entry><entry key="instructions"><