virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 51)
Status: Beta
Brought to you by:
alllee
You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(21) |
Aug
(31) |
Sep
(6) |
Oct
(15) |
Nov
(2) |
Dec
(9) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(4) |
Feb
(6) |
Mar
(12) |
Apr
(52) |
May
(14) |
Jun
(19) |
Jul
(81) |
Aug
(115) |
Sep
(36) |
Oct
(88) |
Nov
(46) |
Dec
(58) |
2010 |
Jan
(52) |
Feb
(55) |
Mar
(48) |
Apr
(15) |
May
(5) |
Jun
(38) |
Jul
(27) |
Aug
(24) |
Sep
(28) |
Oct
(1) |
Nov
(2) |
Dec
(29) |
2011 |
Jan
(87) |
Feb
(39) |
Mar
(63) |
Apr
(42) |
May
(26) |
Jun
(53) |
Jul
(23) |
Aug
(43) |
Sep
(37) |
Oct
(25) |
Nov
(4) |
Dec
(7) |
2012 |
Jan
(73) |
Feb
(79) |
Mar
(62) |
Apr
(28) |
May
(12) |
Jun
(2) |
Jul
(9) |
Aug
(1) |
Sep
(8) |
Oct
|
Nov
(3) |
Dec
(3) |
2013 |
Jan
(8) |
Feb
(16) |
Mar
(38) |
Apr
(74) |
May
(62) |
Jun
(15) |
Jul
(49) |
Aug
(19) |
Sep
(9) |
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <al...@us...> - 2010-03-04 00:32:48
|
Revision: 482 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=482&view=rev Author: alllee Date: 2010-03-04 00:32:42 +0000 (Thu, 04 Mar 2010) Log Message: ----------- updated configuration for pretests for rounds 2-6 Modified Paths: -------------- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml 2010-03-04 00:20:10 UTC (rev 481) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml 2010-03-04 00:32:42 UTC (rev 482) @@ -9,6 +9,10 @@ <entry key="resource-width">29</entry> +<!-- enable field of vision for tokens and subjects --> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + <entry key='initial-distribution'>.25</entry> <entry key='tokens-field-of-vision'>true</entry> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml 2010-03-04 00:20:10 UTC (rev 481) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml 2010-03-04 00:32:42 UTC (rev 482) @@ -8,6 +8,10 @@ <entry key="resource-depth">29</entry> <entry key="resource-width">29</entry> +<!-- enable field of vision for tokens and subjects --> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + <entry key='always-explicit'>true</entry> <entry key='max-cell-occupancy'>1</entry> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml 2010-03-04 00:20:10 UTC (rev 481) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml 2010-03-04 00:32:42 UTC (rev 482) @@ -8,6 +8,10 @@ <entry key="resource-width">29</entry> <entry key="duration">240</entry> +<!-- enable field of vision for tokens and subjects --> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + <entry key='always-explicit'>true</entry> <entry key='max-cell-occupancy'>1</entry> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml 2010-03-04 00:20:10 UTC (rev 481) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml 2010-03-04 00:32:42 UTC (rev 482) @@ -8,8 +8,6 @@ <entry key="resource-width">29</entry> <entry key="duration">240</entry> -<!-- enable mobile offspring-generating resource --> -<entry key='resource-generator'>mobile</entry> <!-- enable field of vision for tokens and subjects --> <entry key='tokens-field-of-vision'>true</entry> <entry key='subjects-field-of-vision'>true</entry> @@ -20,7 +18,6 @@ <entry key="sanction-multiplier">2</entry> <entry key="initial-distribution">.25</entry> -<entry key="regrowth-rate">0.01</entry> <entry key='always-explicit'>true</entry> <entry key='max-cell-occupancy'>1</entry> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml 2010-03-04 00:20:10 UTC (rev 481) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml 2010-03-04 00:32:42 UTC (rev 482) @@ -8,7 +8,6 @@ <entry key="resource-width">29</entry> <entry key="duration">240</entry> -<entry key='resource-generator'>mobile</entry> <entry key='tokens-field-of-vision'>true</entry> <entry key='subjects-field-of-vision'>true</entry> <!-- enable sanctioning --> @@ -17,7 +16,6 @@ <entry key="sanction-multiplier">2</entry> <entry key="initial-distribution">.25</entry> -<entry key="regrowth-rate">0.01</entry> <entry key='always-explicit'>true</entry> <entry key='max-cell-occupancy'>1</entry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-03-04 00:20:20
|
Revision: 481 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=481&view=rev Author: alllee Date: 2010-03-04 00:20:10 +0000 (Thu, 04 Mar 2010) Log Message: ----------- refactoring round + server configuration and prepping configuration files for spring voting + field of vision pretests Modified Paths: -------------- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java foraging/trunk/src/main/java/edu/asu/commons/foraging/client/InstructionsView.java foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java foraging/trunk/src/main/java/edu/asu/commons/foraging/facilitator/FacilitatorWindow.java foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java 2010-03-04 00:20:10 UTC (rev 481) @@ -93,16 +93,6 @@ private ChatPanel chatPanel; - public final static String[] roleDescription = { - "Monitor: You cannot harvest but can sanction other participants\n" + - "To sanction press numbers from 1-5. At the end of the round you\n" + - "will receive 25% tokens from every other participant", - "Harvest: You can collect tokens as in earlier rounds. But you \n" + - "cannot sanction", - "Sanction: You cannot harvest but only sanction \n", - "Harvest and Sanction: You can collect tokens and at the same & \n" + - "at the same time sanction other participants"}; - private RegulationPanel regulationPanel; private EnforcementPanel enforcementPanel; @@ -119,19 +109,10 @@ public Timer timer; - public static final Object regulationSignal = new Object(); - - public static final Object enforcementVotesSignal = new Object(); - - public static final Object regulationVotesSignal = new Object(); - - public static final Object clientRoleSignal = new Object(); - private final StringBuilder instructionsBuilder = new StringBuilder(); private EventChannel channel; - private CardLayout cardLayout; // private EnergyLevel energyLevel; @@ -182,7 +163,6 @@ } // don't display next round time, instead wait for the // facilitator signal. - timeLeftLabel.setText("Waiting for facilitator's signal."); informationLabel.setText("Waiting for facilitator's signal."); // add the next round instructions to the existing debriefing text set by the previous @@ -199,6 +179,8 @@ Properties actualAnswers = formEvent.getData(); // actualAnswers.list(System.err); List<String> incorrectAnswers = new ArrayList<String>(); + // FIXME: always send a quiz response event. + // iterate through expected answers for (Map.Entry<String, String> entry : configuration.getQuizAnswers().entrySet()) { String questionNumber = entry.getKey(); @@ -255,7 +237,6 @@ } private void startEnforcementVotingTimer() { - if (timer == null) { //FIXME: Need to fetch this value from the round4.xml duration = Duration.create(dataModel.getRoundConfiguration().getEnforcementVotingDuration()); @@ -388,8 +369,6 @@ instructionsScrollPane.requestFocusInWindow(); } - - private HtmlEditorPane createInstructionsEditorPane() { // JEditorPane pane = new JEditorPane("text/html", // "Costly Sanctioning Experiment"); @@ -686,7 +665,7 @@ event.getCurrentTokens(), getIncome(event.getCurrentTokens())) ); - double showUpFee = dataModel.getRoundConfiguration().getParentConfiguration().getShowUpFee(); + double showUpFee = dataModel.getRoundConfiguration().getParentConfiguration().getShowUpPayment(); instructionsBuilder.append(String.format("Your <b>total income</b> so far (including a $%3.2f bonus for showing up) is : $%3.2f<hr>", showUpFee, dataModel.getTotalIncome() + showUpFee)); if (event.isLastRound()) { @@ -749,7 +728,14 @@ public void showInstructions() { RoundConfiguration roundConfiguration = dataModel.getRoundConfiguration(); instructionsBuilder.delete(0, instructionsBuilder.length()); - instructionsBuilder.append(roundConfiguration.getInstructions()); + if (roundConfiguration.isFirstRound()) { + instructionsBuilder.append(roundConfiguration.getGeneralInstructions()); + } + if (roundConfiguration.isFieldOfVisionEnabled()) { + instructionsBuilder.append(roundConfiguration.getFieldOfVisionInstructions()); + } + instructionsBuilder.append(roundConfiguration.getInstructions()); + // and add the quiz instructions if the quiz is enabled. if (roundConfiguration.isQuizEnabled()) { @@ -760,6 +746,7 @@ instructionsEditorPane.setActionListener(null); instructionsEditorPane.setActionListener(createQuizListener(roundConfiguration)); } + setInstructions(instructionsBuilder.toString()); } public void switchInstructionsPane() { Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/InstructionsView.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/InstructionsView.java 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/InstructionsView.java 2010-03-04 00:20:10 UTC (rev 481) @@ -66,7 +66,7 @@ if (roundConfiguration.isPracticeRound()) { instructionsBuilder.append("<h3>Note - since this was a practice round you did not earn any income this round.</h3>"); } - double showUpFee = roundConfiguration.getParentConfiguration().getShowUpFee(); + double showUpFee = roundConfiguration.getParentConfiguration().getShowUpPayment(); instructionsBuilder.append(String.format("Your <b>total income</b> so far (including a $%3.2f bonus for showing up) is : $%3.2f<hr>", showUpFee, dataModel.getTotalIncome() + showUpFee)); if (lastRound) { Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java 2010-03-04 00:20:10 UTC (rev 481) @@ -425,9 +425,17 @@ } public String getWelcomeInstructions() { - return getStringProperty("welcome-instructions", "Please wait quietly and do not open or close any programs on this computer."); + return getParentConfiguration().getWelcomeInstructions(); } + public String getGeneralInstructions() { + return getParentConfiguration().getGeneralInstructions(); + } + + public String getFieldOfVisionInstructions() { + return getParentConfiguration().getFieldOfVisionInstructions(); + } + public EnforcementMechanism[] getEnforcementMechanisms() { return EnforcementMechanism.values(); } @@ -435,5 +443,9 @@ public boolean isVotingAndRegulationEnabled() { return getBooleanProperty("voting-and-regulation-enabled", false); } + + public boolean isFieldOfVisionEnabled() { + return isTokensFieldOfVisionEnabled() || isSubjectsFieldOfVisionEnabled(); + } } Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java 2010-03-04 00:20:10 UTC (rev 481) @@ -63,8 +63,22 @@ return false; } - public double getShowUpFee() { - return assistant.getDoubleProperty("show-up-fee", 5.0d); + public double getShowUpPayment() { + return assistant.getDoubleProperty("show-up-payment", 5.0d); } + + public String getWelcomeInstructions() { + return assistant.getStringProperty("welcome-instructions", "Please wait quietly and do not open or close any programs on this computer."); + } + + public String getGeneralInstructions() { + return assistant.getStringProperty("general-instructions", ""); + } + + public String getFieldOfVisionInstructions() { + return assistant.getProperty("field-of-vision-instructions", + "Your vision is limited in this experiment. The area that is visible to you will be shaded."); + } + } Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/facilitator/FacilitatorWindow.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/facilitator/FacilitatorWindow.java 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/facilitator/FacilitatorWindow.java 2010-03-04 00:20:10 UTC (rev 481) @@ -354,7 +354,7 @@ clientId.toString(), data.getCurrentTokens(), getIncome(data.getCurrentTokens()), - data.getTotalIncome() + facilitator.getServerConfiguration().getShowUpFee())); + data.getTotalIncome() + facilitator.getServerConfiguration().getShowUpPayment())); } builder.append("</tbody></table><hr>"); if (event.isLastRound()) { Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml 2010-03-04 00:20:10 UTC (rev 481) @@ -15,47 +15,8 @@ <entry key="q1">C</entry> <entry key="q2">B</entry> -<entry key="instructions"> +<entry key='instructions'> <![CDATA[ -<h3>General Instructions</h3> -<p> -You will appear on the screen as a yellow dot <img -src="@CODEBASE_URL@/images/gem-self.gif">, You can move by pressing the four arrow -keys on your keyboard. You can move either up, down, left, or right. You have to -press a key for each and every move of your yellow dot. In this experiment you can -collect green diamond shaped tokens -<img src="@CODEBASE_URL@/images/gem-token.gif"> and you will -earn two cents for each collected token. To collect a token, simply move your -yellow dot over a green token and press the <b>space bar</b>. If you move -over a token without pressing the <b>space bar</> you will NOT collect that -token. -</p> - -<p> -The tokens that you collect have the potential to regenerate. After you have -collected a green token, a new token can once again appear on that empty cell. -However, the rate at which new tokens will appear depends on the number of -adjacent cells that still have tokens. The more tokens in the 8 cells around -an empty cell, the faster a new token will appear on that empty cell. Existing -tokens can generate new tokens. Thus the middle cell in Image 1 denoted with X will -be regenerated at a faster rate than the middle cell in Image 2. When all -neighboring cells are empty, there is no renewal. - -<table width="100%"> -<tr> -<td align="center"><b>Image 1</b></td> -<td align="center"><b>Image 2</b></td> -</tr> -<tr> -<td align="center"> -<img src="@CODEBASE_URL@/images/8neighbors.jpg" alt="image 1"> -</td> -<td align="center"> -<img src="@CODEBASE_URL@/images/5neighbors.jpg" alt="image 2"> -</td> -</tr> -</table> -<hr> <h3>Practice Round Instructions</h3> <hr> <p> @@ -65,11 +26,11 @@ with green tokens. The environment is a 13 x 13 grid of cells. </p> <p> -When you push the <b>R</b> key you will reset the distribution of -the tokens to randomly occupying half of the cells with green tokens. +During this practice round, and <b>only during</b> this practice round, you are able +to reset the tokens displayed on the screen by pressing the <b>R</b> key. When you +press the <b>R</b> key you will reset the resource to its initial distribution, +randomly filling half of the cells. </p> - -<p><center><b>Please do not communicate with any other participant.</b></center></p> <p>If you have any questions please raise your hand. <b>Do you have any questions so far?</b></p> ]]> @@ -104,18 +65,5 @@ </form> ]]> </entry> -<entry key="welcome-instructions"> -<![CDATA[ -<h3>Welcome</h3> -<p> -Welcome. You have already earned 5 dollars for showing up at this experiment. -You can earn more, up to a maximum of 40 dollars, by participating in this -experiment, which will take about an hour. The amount of money you earn -depends on your decisions as well as the decisions of your group members -during the four rounds of the experiment. Please be patient while the rest of the -participants are seated, the experiment will begin shortly. -</p> -]]> -</entry> </properties> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml 2010-03-04 00:20:10 UTC (rev 481) @@ -1,25 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> -<comment>Foraging XML-ized experiment round configuration</comment> +<comment>Foraging XML experiment round configuration</comment> <entry key="display-group-tokens">true</entry> <entry key="clients-per-group">5</entry> <entry key="duration">240</entry> <entry key="resource-depth">29</entry> <entry key="resource-width">29</entry> -<entry key='resource-generator'>mobile</entry> -<entry key='starting-tokens'>10</entry> -<entry key='dollars-per-token'>.10</entry> - <entry key='tokens-field-of-vision'>true</entry> <entry key='subjects-field-of-vision'>true</entry> <entry key='always-explicit'>true</entry> <entry key='max-cell-occupancy'>1</entry> - - <entry key="instructions"> <![CDATA[ <h3>Round 1 Instructions</h3> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml 2010-03-04 00:20:10 UTC (rev 481) @@ -9,9 +9,7 @@ <entry key="resource-width">29</entry> -<entry key='resource-generator'>mobile</entry> -<entry key='starting-tokens'>10</entry> -<entry key='dollars-per-token'>.10</entry> +<entry key='initial-distribution'>.25</entry> <entry key='tokens-field-of-vision'>true</entry> <entry key='subjects-field-of-vision'>true</entry> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml 2010-03-04 00:20:10 UTC (rev 481) @@ -8,25 +8,12 @@ <entry key="resource-depth">29</entry> <entry key="resource-width">29</entry> -<entry key='resource-generator'>mobile</entry> -<entry key='tokens-field-of-vision'>true</entry> -<entry key='subjects-field-of-vision'>true</entry> - <entry key='always-explicit'>true</entry> <entry key='max-cell-occupancy'>1</entry> <!-- resource regrowth parameters --> <entry key="initial-distribution">.25</entry> -<entry key="regrowth-rate">0.01</entry> -<!-- -<entry key="patchy">true</entry> -<entry key="top-initial-distribution">0.50</entry> -<entry key="top-rate">0.02</entry> -<entry key="bottom-initial-distribution">0.25</entry> -<entry key="bottom-rate">0.01</entry> ---> - <entry key="instructions"> <![CDATA[ <h3>Round 3 Instructions</h3> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml 2010-03-04 00:20:10 UTC (rev 481) @@ -8,10 +8,6 @@ <entry key="resource-width">29</entry> <entry key="duration">240</entry> -<entry key='resource-generator'>mobile</entry> -<entry key='tokens-field-of-vision'>true</entry> -<entry key='subjects-field-of-vision'>true</entry> - <entry key='always-explicit'>true</entry> <entry key='max-cell-occupancy'>1</entry> @@ -26,7 +22,6 @@ <entry key="initial-distribution">.25</entry> -<entry key="regrowth-rate">0.01</entry> <!-- enable quiz --> <entry key='quiz'>true</entry> @@ -154,5 +149,4 @@ </form> ]]> </entry> - </properties> Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml 2010-03-03 07:07:30 UTC (rev 480) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml 2010-03-04 00:20:10 UTC (rev 481) @@ -27,10 +27,72 @@ </p> ]]> </entry> + <entry key='field-of-vision-instructions'> <![CDATA[ Your vision is limited in this experiment. The area that is visible to you will be -shaded in gray. +shaded. ]]> </entry> + +<entry key="welcome-instructions"> +<![CDATA[ +<h3>Welcome to the experiment. The experiment will begin shortly after everyone has been +assigned a station.</h3> +<p> +Please <b>wait quietly</b> and <b>do not close this window or open any other applications</b>. +</p> +]]> +</entry> + +<entry key="general-instructions"> +<![CDATA[ +<h3>General Instructions</h3> +<p> +Welcome. You have already earned 5 dollars by showing up at this experiment. You can +earn more, up to a maximum of 40 dollars, by participating in this experiment, which +will take about an hour to an hour and a half. The amount of money you earn depends +on your decisions as well as the decisions of other people in this room during the +six rounds of the experiment. +</p> +<p> +You appear on the screen as a yellow dot <img src="@CODEBASE_URL@/images/gem-self.gif">. +You move by pressing the four arrow keys on your keyboard. You can move up, down, +left, or right. You have to press a key for each and every move of your yellow dot. +In this experiment you can collect green diamond shaped tokens +<img src="@CODEBASE_URL@/images/gem-token.gif"> and earn two cents for each collected token. +To collect a token, move your yellow dot over a green token and press the <b>space +bar</b>. If you move over a token without pressing the <b>space bar</> you do NOT +collect that token. +</p> + +<p> +The tokens that you collect have the potential to regenerate. After you have +collected a green token, a new token can re-appear on that empty cell. +However, the rate at which new tokens will appear depends on the number of +adjacent cells with tokens. The more tokens in the eight cells around +an empty cell, the faster a new token will appear on that empty cell. In other +words, <b>existing tokens can generate new tokens</b>. To illustrate this, please +see refer to Image 1 and Image 2. The middle cell in Image 1 denoted with an X has +a greater chance of regeneration than the middle cell in Image 2. When all +neighboring cells are empty, there is <b>no chance for regeneration</b>. + +<table width="100%"> +<tr> +<td align="center"><b>Image 1</b></td> +<td align="center"><b>Image 2</b></td> +</tr> +<tr> +<td align="center"> +<img src="@CODEBASE_URL@/images/8neighbors.jpg" alt="image 1"> +</td> +<td align="center"> +<img src="@CODEBASE_URL@/images/5neighbors.jpg" alt="image 2"> +</td> +</tr> +</table> +]]> +</entry> + + </properties> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:44:22
|
foraging voting and field of vison issues ----------------------------------------- Key: COMMONS-24 URL: http://opensource.asu.edu/jira/browse/COMMONS-24 Project: The Virtual Commons Issue Type: Improvement Components: foraging Affects Versions: enhanced foraging Reporter: Allen Lee Assignee: Allen Lee Priority: Blocker in quiz, underline + bold "incorrect" replace avatar with yellow dot at the end of the practice round, tell people why they didn't earn any money visual artifacts on Seema and Marcel's laptops, duplication of the score and time labels, refresh / repaint issue where Marco's laptop: visual artifacts, old version of code appears with purple slash over avatar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:44:21
|
[ http://opensource.asu.edu/jira/browse/COMMONS-15?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Allen Lee resolved COMMONS-15. ------------------------------ Resolution: Fixed Fixed by adding a handshake to the client to notify the server of it's updated SocketIdentifier > ip address changes in COOR 5519 > ------------------------------- > > Key: COMMONS-15 > URL: http://opensource.asu.edu/jira/browse/COMMONS-15 > Project: The Virtual Commons > Issue Type: Bug > Components: csidex, irrigation > Affects Versions: irrigation pretest fall 2009, irrigation spring 2010 > Environment: COOR 5519 windows boxes > Reporter: Allen Lee > Assignee: Allen Lee > Priority: Blocker > Fix For: irrigation spring 2010 > > > The static IP scheme in COOR 5519 has been changed by UTO; IPs are now being allocated by DHCP so we can't get the station # from the static IP address. We might still be able to grab it from the hostname, e.g., 1757-SPSS-17 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:44:20
|
[ http://opensource.asu.edu/jira/browse/COMMONS-24?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Allen Lee reassigned COMMONS-24: -------------------------------- Assignee: Deepak Barge (was: Allen Lee) > foraging voting and field of vison issues > ----------------------------------------- > > Key: COMMONS-24 > URL: http://opensource.asu.edu/jira/browse/COMMONS-24 > Project: The Virtual Commons > Issue Type: Improvement > Components: foraging > Affects Versions: enhanced foraging > Reporter: Allen Lee > Assignee: Deepak Barge > Priority: Blocker > > in quiz, underline + bold "incorrect" > replace avatar with yellow dot > at the end of the practice round, tell people why they didn't earn any money > visual artifacts on Seema and Marcel's laptops, duplication of the score and time labels, refresh / repaint issue where > Marco's laptop: visual artifacts, old version of code appears with purple slash over avatar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:44:19
|
[ http://opensource.asu.edu/jira/browse/COMMONS-7?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=10048#action_10048 ] Allen Lee commented on COMMONS-7: --------------------------------- Appears to be working for the most part, but at a recent pretest Marco had issues with the client images not loading properly (and then loading improperly in subsequent rounds). > images aren't always loading properly (resize fixes it sometimes) > ----------------------------------------------------------------- > > Key: COMMONS-7 > URL: http://opensource.asu.edu/jira/browse/COMMONS-7 > Project: The Virtual Commons > Issue Type: Bug > Components: foraging > Reporter: Allen Lee > Assignee: Allen Lee > Priority: Critical > > Images in the foraging experiment aren't always loaded properly. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:44:17
|
[ http://opensource.asu.edu/jira/browse/COMMONS-11?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Allen Lee updated COMMONS-11: ----------------------------- Affects Version/s: (was: irrigation pretest fall 2009) (was: irrigation spring 2010) Fix Version/s: (was: irrigation spring 2010) Component/s: foraging > freemarker template support > --------------------------- > > Key: COMMONS-11 > URL: http://opensource.asu.edu/jira/browse/COMMONS-11 > Project: The Virtual Commons > Issue Type: Improvement > Components: csidex, foraging > Reporter: Allen Lee > Assignee: Allen Lee > > Add freemarker template support to virtual commons experiments so that we can support instructions with interpolated data values (i.e., duration, rules, etc.) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:44:16
|
[ http://opensource.asu.edu/jira/browse/COMMONS-8?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Allen Lee reassigned COMMONS-8: ------------------------------- Assignee: Deepak Barge (was: Allen Lee) > regulation and voting panel display improvements > ------------------------------------------------ > > Key: COMMONS-8 > URL: http://opensource.asu.edu/jira/browse/COMMONS-8 > Project: The Virtual Commons > Issue Type: Improvement > Reporter: Allen Lee > Assignee: Deepak Barge > > regulation panel and enforcement panel / voting display needs a lot of UI enhancement to make them readable / usable. > get rid of side-scrolling text. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:44:15
|
[ http://opensource.asu.edu/jira/browse/COMMONS-25?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Allen Lee deleted COMMONS-25: ----------------------------- > test > ---- > > Key: COMMONS-25 > URL: http://opensource.asu.edu/jira/browse/COMMONS-25 > Project: The Virtual Commons > Issue Type: Improvement > Reporter: Deepak Barge > Assignee: Allen Lee > > Testing -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Deepak B. (JIRA) <jef...@as...> - 2010-03-03 20:44:14
|
test ---- Key: COMMONS-25 URL: http://opensource.asu.edu/jira/browse/COMMONS-25 Project: The Virtual Commons Issue Type: Improvement Reporter: Deepak Barge Assignee: Allen Lee Testing -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: Allen L. (JIRA) <jef...@as...> - 2010-03-03 20:37:00
|
[ http://opensource.asu.edu/jira/browse/COMMONS-24?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Allen Lee updated COMMONS-24: ----------------------------- Description: in quiz, underline + bold "incorrect" replace avatar with yellow dot at the end of the practice round, tell people why they didn't earn any money visual artifacts on Seema and Marcel's laptops, duplication of the score and time labels, refresh / repaint issue where Marco's laptop: visual artifacts, old version of code appears with purple slash over avatar Make field of vision distinctly yellow was: in quiz, underline + bold "incorrect" replace avatar with yellow dot at the end of the practice round, tell people why they didn't earn any money visual artifacts on Seema and Marcel's laptops, duplication of the score and time labels, refresh / repaint issue where Marco's laptop: visual artifacts, old version of code appears with purple slash over avatar > foraging voting and field of vison issues > ----------------------------------------- > > Key: COMMONS-24 > URL: http://opensource.asu.edu/jira/browse/COMMONS-24 > Project: The Virtual Commons > Issue Type: Improvement > Components: foraging > Affects Versions: enhanced foraging > Reporter: Allen Lee > Assignee: Deepak Barge > Priority: Blocker > > in quiz, underline + bold "incorrect" > replace avatar with yellow dot > at the end of the practice round, tell people why they didn't earn any money > visual artifacts on Seema and Marcel's laptops, duplication of the score and time labels, refresh / repaint issue where > Marco's laptop: visual artifacts, old version of code appears with purple slash over avatar > Make field of vision distinctly yellow -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: <db...@us...> - 2010-03-03 07:07:38
|
Revision: 480 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=480&view=rev Author: dbarge Date: 2010-03-03 07:07:30 +0000 (Wed, 03 Mar 2010) Log Message: ----------- This code version has 2 changes 1) Added a function call setClip() in order to clip the part of the field of vision circle that crossed the playing boundary. 2) Changed the RGB values (Color) of the field of vision so as to make it more bright and is more easy to visualize. Modified Paths: -------------- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java 2010-03-02 23:03:47 UTC (rev 479) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java 2010-03-03 07:07:30 UTC (rev 480) @@ -3,6 +3,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; +import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Paint; import java.awt.Point; @@ -39,7 +40,7 @@ private final ClientDataModel dataModel; - public final static Color FIELD_OF_VISION_COLOR = new Color(192, 192, 192, 30); + public final static Color FIELD_OF_VISION_COLOR = new Color(255, 255, 255, 30); // associates a Duration with a piece of token consumed at the given Point - // the duration is used to render the token as shrinking. @@ -136,7 +137,10 @@ int y = scaleY(topLeftCorner.y); int diameter = (int) radius * 2; diameter = Math.min(scaleX(diameter), scaleY(diameter)); - Ellipse2D.Double circle = new Ellipse2D.Double(x, y, diameter, diameter); + Ellipse2D.Double circle = new Ellipse2D.Double(x, y, diameter, diameter); + //graphics2D.fillOval(x, y, diameter, diameter); + // clip the rendered part of the Field of vision circle that crosses the playing boundary + graphics2D.setClip(circle); graphics2D.fill(circle); graphics2D.setPaint(originalPaint); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-03-02 23:03:56
|
Revision: 479 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=479&view=rev Author: alllee Date: 2010-03-02 23:03:47 +0000 (Tue, 02 Mar 2010) Log Message: ----------- voting field of vision configuration for spring 2010 pretest Added Paths: ----------- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round0.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="resource-width">13</entry> +<entry key="resource-depth">13</entry> +<entry key="practice-round">true</entry> +<entry key="private-property">true</entry> +<entry key="duration">240</entry> + +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key="quiz">true</entry> +<entry key="q1">C</entry> +<entry key="q2">B</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>General Instructions</h3> +<p> +You will appear on the screen as a yellow dot <img +src="@CODEBASE_URL@/images/gem-self.gif">, You can move by pressing the four arrow +keys on your keyboard. You can move either up, down, left, or right. You have to +press a key for each and every move of your yellow dot. In this experiment you can +collect green diamond shaped tokens +<img src="@CODEBASE_URL@/images/gem-token.gif"> and you will +earn two cents for each collected token. To collect a token, simply move your +yellow dot over a green token and press the <b>space bar</b>. If you move +over a token without pressing the <b>space bar</> you will NOT collect that +token. +</p> + +<p> +The tokens that you collect have the potential to regenerate. After you have +collected a green token, a new token can once again appear on that empty cell. +However, the rate at which new tokens will appear depends on the number of +adjacent cells that still have tokens. The more tokens in the 8 cells around +an empty cell, the faster a new token will appear on that empty cell. Existing +tokens can generate new tokens. Thus the middle cell in Image 1 denoted with X will +be regenerated at a faster rate than the middle cell in Image 2. When all +neighboring cells are empty, there is no renewal. + +<table width="100%"> +<tr> +<td align="center"><b>Image 1</b></td> +<td align="center"><b>Image 2</b></td> +</tr> +<tr> +<td align="center"> +<img src="@CODEBASE_URL@/images/8neighbors.jpg" alt="image 1"> +</td> +<td align="center"> +<img src="@CODEBASE_URL@/images/5neighbors.jpg" alt="image 2"> +</td> +</tr> +</table> +<hr> +<h3>Practice Round Instructions</h3> +<hr> +<p> +You will now have four minutes to practice with the experimental environment. +The decisions you make in this round will NOT influence your earnings. At the +At the beginning of the practice round half of the cells are occupied +with green tokens. The environment is a 13 x 13 grid of cells. +</p> +<p> +When you push the <b>R</b> key you will reset the distribution of +the tokens to randomly occupying half of the cells with green tokens. +</p> + +<p><center><b>Please do not communicate with any other participant.</b></center></p> +<p>If you have any questions please raise your hand. <b>Do you have any +questions so far?</b></p> +]]> +</entry> + +<entry key="quiz-instructions"> +<![CDATA[ +<p> +Before we begin the practice round you need to answer the following questions +correctly. You can only continue when you have answered all questions +correctly. If an error is made you will need to answer the questions again. +</p> +<br> +<form> +Which of the statements is incorrect? <br> +<input type="radio" name="q1" value="A">Your decisions of where to collect tokens affects the regeneration of tokens.<br> +<input type="radio" name="q1" value="B">When you have collected all tokens on +the screen, no new tokens will appear.<br> +<input type="radio" name="q1" value="C">Tokens grow from the middle of the +screen.<br> +<input type="radio" name="q1" value="D">In order to collect a token you need +to press the space bar while your avatar is on a cell with a token.<br> +<br><br> + +Which sequence of situations is not possible? <br> +<img src="@CODEBASE_URL@/images/question2.jpg"><br> +<input type="radio" name="q2" value="A">A<br> +<input type="radio" name="q2" value="B">B<br> +<input type="radio" name="q2" value="C">C<br> +<br> +<input type="submit" name="submit" value="Submit"> +</form> +]]> +</entry> +<entry key="welcome-instructions"> +<![CDATA[ +<h3>Welcome</h3> +<p> +Welcome. You have already earned 5 dollars for showing up at this experiment. +You can earn more, up to a maximum of 40 dollars, by participating in this +experiment, which will take about an hour. The amount of money you earn +depends on your decisions as well as the decisions of your group members +during the four rounds of the experiment. Please be patient while the rest of the +participants are seated, the experiment will begin shortly. +</p> +]]> +</entry> + +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round1.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="duration">240</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='starting-tokens'>10</entry> +<entry key='dollars-per-token'>.10</entry> + +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + + + +<entry key="instructions"> +<![CDATA[ +<h3>Round 1 Instructions</h3> +<hr> +<p> +This is the first round of the experiment. The length of the round is 4 +minutes. Like in the practice round you can collect green tokens. This time +you earn <b>two cents</b> for each token collected. This time you +<b>cannot</b> reset the distribution of green tokens. +</p> +<p> +In this round the renewable resource will become five times bigger. You will share this +larger environment with four other players in this room that have been randomly +selected. One group's resource environment is distinct from the other groups. +</p> +<p> +Each of you has been assigned a number from 1 to 5. These numbers will remain the +same throughout the experiment but you will <b>not</b> be able to identify which +person in the room has been assigned which number, so your anonymity is guaranteed. + +The other four players will appear on the screen as blue dots +<img src="@CODEBASE_URL@/images/gem-other.gif"> with a white +number embedded in the dot. On the top right corner of the screen you can see +how many tokens each player has collected. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round2.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="duration">240</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> + + +<entry key='resource-generator'>mobile</entry> +<entry key='starting-tokens'>10</entry> +<entry key='dollars-per-token'>.10</entry> + +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 2 Instructions</h3> +<hr> +<p> +Round 2 is the same as round 1. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round3.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="duration">240</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- resource regrowth parameters --> +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<!-- +<entry key="patchy">true</entry> +<entry key="top-initial-distribution">0.50</entry> +<entry key="top-rate">0.02</entry> +<entry key="bottom-initial-distribution">0.25</entry> +<entry key="bottom-rate">0.01</entry> +--> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 3 Instructions</h3> +<hr> +<p> +Round 3 is the same as round 2. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round4.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> +<entry key="duration">240</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- before this round begins, we have a chat session --> +<entry key="chat-enabled">true</entry> +<entry key="chat-duration">240</entry> + +<!-- enable sanctioning --> +<entry key="sanction-type">real-time</entry> +<entry key="sanction-cost">1</entry> +<entry key="sanction-multiplier">2</entry> + + +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<!-- enable quiz --> +<entry key='quiz'>true</entry> +<entry key='q1'>1</entry> +<entry key='q2'>2</entry> +<entry key='q3'>1</entry> +<entry key='q4'>1</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 4 Instructions</h3> +<hr> +<p> +Round 4 is the same as the previous two rounds with two exceptions. +</p> +<p> +Before the next round starts you can anonymously communicate by text messages +for four minutes with the other participants in your group. You can use this +opportunity to discuss the experiment and coordinate your actions to improve +your earnings. You may not promise side-payments after the experiment is +completed or make any threats. You are also not allowed to reveal your real +identity. We are monitoring the chat traffic while you chat. +</p> +<p> +During the next round you will have the option to reduce the earnings of another +participant at a cost to your own earnings. +</p> +<ul> +<li>If you press the numeric key 1-5 corresponding to another participant, you +will reduce the number of tokens they have collected in this round by two +tokens. This will also reduce your own token amount by one token. The decision +whether or when to use this option is up to you. +<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>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>You may reduce the earnings of other participants as long as there are +tokens remaining on the screen and while 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>one</b>, and their token amount is reduced by +<b>two</b>. <b>Note:</b> You can only remove tokens from a participant that is +visible to you. +</ul> +<p> + +<p> +The length of this round is four minutes. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> + +<entry key="chat-instructions"> +<![CDATA[ +<p> +You can now chat with the other participants in your group for 4 minutes +total. During the chat round, you may communicate about any aspect of the +experiment that you would like to discuss with other participants with whom +you have been matched. You may not promise them side-payments after the +experiment is completed or threaten them with any consequence after the +experiment is finished. We are monitoring the chat traffic while you chat. If +we see that somebody reveals his or her identity, we have to stop the +experiment and remove the whole group from which this person is a member out +of this room. +</p> +<p> +You will see other participants labeled as "1", "2","3", "4", or "5" in the +chat box. You can send a chat message by typing into the textfield at the +bottom of the screen and clicking the "send" button with your mouse or +pressing the "enter" key on your keyboard. +</p> +]]> +</entry> +<entry key="quiz-instructions"> +<![CDATA[ +<p>Before the next round begins you must complete the quiz below. You can +only continue when you have answered all questions correctly. If an error is +made you will need to answer the questions again. +</p> + +<form> +Each time I press the numeric keys between 1-5 my tokens will be reduced +by:<br> +<input type="radio" name="q1" value="0">0 tokens<br> +<input type="radio" name="q1" value="1">1 token<br> +<input type="radio" name="q1" value="2">2 tokens<br> +<input type="radio" name="q1" value="4">4 tokens<br> +<br><br> + +Each time I press the numeric keys between 1-5 the number of tokens of the +corresponding participant is reduced by:<br> +<input type="radio" name="q2" value="0">0 tokens<br> +<input type="radio" name="q2" value="1">1 token<br> +<input type="radio" name="q2" value="2">2 tokens<br> +<input type="radio" name="q2" value="4">4 tokens<br> +<br><br> + +The background of your avatar turns blue. What does this represent?<br> +<input type="radio" name="q3" value="0">You collected a token<br> +<input type="radio" name="q3" value="1">Another participant is subtracting two +tokens from you<br> +<input type="radio" name="q3" value="2">You are subtracting two tokens from another +participant<br> +<input type="radio" name="q3" value="3">You are moving too fast<br> +<br><br> + +Every time I press the numeric keys between 1-5:<br> +<input type="radio" name="q4" value="0">Two tokens are subtracted from my tokens +collected this round<br> +<input type="radio" name="q4" value="1">One token is subtracted from my tokens +collected this round<br> +<input type="radio" name="q4" value="2">The background of my avatar turns blue +momentarily<br> +<input type="radio" name="q4" value="3">My avatar is paused for two seconds<br> + +<input type="submit" name="submit" value="Submit"> +</form> +]]> +</entry> + +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round5.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> +<entry key="duration">240</entry> + +<!-- enable mobile offspring-generating resource --> +<entry key='resource-generator'>mobile</entry> +<!-- enable field of vision for tokens and subjects --> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<!-- enable sanctioning --> +<entry key="sanction-type">real-time</entry> +<entry key="sanction-cost">1</entry> +<entry key="sanction-multiplier">2</entry> + +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- before this round begins, we have a chat session --> +<entry key="chat-enabled">true</entry> +<entry key="chat-duration">240</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 5 Instructions</h3> +<hr> +<p> +Round 5 is the same as round 4.</p> +<p> +The length of this round is again four minutes. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> + +<entry key="chat-instructions"> +<![CDATA[ +<p> +You can now chat with the other participants in your group for 4 minutes +total. During the chat round, you may communicate about any aspect of the +experiment that you would like to discuss with other participants with whom +you have been matched. You may not promise them side-payments after the +experiment is completed or threaten them with any consequence after the +experiment is finished. We are monitoring the chat traffic while you chat. If +we see that somebody reveals his or her identity, we have to stop the +experiment and remove the whole group from which this person is a member out +of this room. +</p> +<p> +You will see other participants labeled as "1", "2","3", "4", or "5" in the +chat box. You can send a chat message by typing into the textfield at the +bottom of the screen and clicking the "send" button with your mouse or +pressing the "enter" key on your keyboard. +</p> +]]> +</entry> + +<entry key='private-chat-instructions'> +<![CDATA[ +You may send private messages to a specific participant by clicking on the +appropriately labeled button (1, 2, 3, 4, or 5) before typing your message in +the chat box and sending it. By default you are communicating with all +members of your group. +]]> +</entry> + +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/round6.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> +<entry key="duration">240</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> +<!-- enable sanctioning --> +<entry key="sanction-type">real-time</entry> +<entry key="sanction-cost">1</entry> +<entry key="sanction-multiplier">2</entry> + +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- before this round begins, we have a chat session --> +<entry key="chat-enabled">true</entry> +<entry key="chat-duration">240</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 6 Instructions</h3> +<hr> +<p> +Round 6 is the same as round 5.</p> +<p> +The length of this round is again four minutes. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> + +<entry key="last-round-debriefing"> +<![CDATA[ +<p> +This was the last round, but not the end of the experiment. We will now +determine your payments. While we are doing this, we request that you +carefully fill out a brief survey. +</p> +<p> +When we are ready we will call you one by one to the room next door. We will +pay you there in private. Please wait until your computer number is called, +and then proceed to the room next door to turn in your computer number and +your survey. +</p> +<p> +Please answer the survey carefully and thank you for participating. +</p> +]]> +</entry> + +<entry key="chat-instructions"> +<![CDATA[ +<p> +You can now chat with the other participants in your group for 4 minutes +total. During the chat round, you may communicate about any aspect of the +experiment that you would like to discuss with other participants with whom +you have been matched. You may not promise them side-payments after the +experiment is completed or threaten them with any consequence after the +experiment is finished. We are monitoring the chat traffic while you chat. If +we detect that somebody has revealed their identity, we will have to stop the +experiment and remove that person's entire group from the experiment. +</p> +<p> +You will see other participants labeled as "1", "2","3", "4", or "5" in the +chat box. You can send a chat message by typing into the textfield at the +bottom of the screen and clicking the "send" button with your mouse or +pressing the "enter" key on your keyboard. </p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/voting-fov/server.xml 2010-03-02 23:03:47 UTC (rev 479) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Costly Sanctioning XML-ized experiment round configuration</comment> +<entry key="hostname">@SERVER_ADDRESS@</entry> +<entry key="port">@PORT_NUMBER@</entry> +<entry key="round0">round0.xml</entry> +<entry key="round1">round1.xml</entry> +<entry key="round2">round2.xml</entry> +<entry key="round3">round3.xml</entry> +<entry key="round4">round4.xml</entry> +<entry key="round5">round5.xml</entry> +<entry key="round6">round6.xml</entry> +<entry key="wait-for-participants">true</entry> +<entry key="number-of-rounds">7</entry> +<entry key="facilitator-instructions"> +<![CDATA[ +<h3>Facilitator Instructions</h3> +<p> +Welcome to the facilitator interface. This interface allows you to control +the experiment. You may only modify configuration parameters <b>before</b> +you start the experiment by selecting the Configuration menu. When all the +participants are ready to begin the experiment, you can start the experiment +by selecting Experiment -> Start. After a round has been completed you +will be able to view the statistics for all of the participants. You can +begin the next round by selecting Round -> Start. +</p> +]]> +</entry> +<entry key='field-of-vision-instructions'> +<![CDATA[ +Your vision is limited in this experiment. The area that is visible to you will be +shaded in gray. +]]> +</entry> +</properties> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-24 19:08:28
|
Revision: 477 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=477&view=rev Author: alllee Date: 2010-02-24 18:15:30 +0000 (Wed, 24 Feb 2010) Log Message: ----------- int -> long Modified Paths: -------------- csidex/trunk/src/test/java/edu/asu/commons/experiment/SaveFileProcessorTest.java Modified: csidex/trunk/src/test/java/edu/asu/commons/experiment/SaveFileProcessorTest.java =================================================================== --- csidex/trunk/src/test/java/edu/asu/commons/experiment/SaveFileProcessorTest.java 2010-02-24 04:38:10 UTC (rev 476) +++ csidex/trunk/src/test/java/edu/asu/commons/experiment/SaveFileProcessorTest.java 2010-02-24 18:15:30 UTC (rev 477) @@ -15,45 +15,44 @@ * @author <a href='mailto:all...@as...'>Allen Lee</a> */ public class SaveFileProcessorTest { - - private static class IntervalProcessor extends SaveFileProcessor.Base { - @Override - public void process(SavedRoundData savedRoundData, PrintWriter writer) { - - } + private static class IntervalProcessor extends SaveFileProcessor.Base { - @Override - public String getOutputFileExtension() { - return "-test-interval.txt"; - } - } - - private IntervalProcessor processor; + @Override + public void process(SavedRoundData savedRoundData, PrintWriter writer) { + } - @Before - public void setUp() { - processor = new IntervalProcessor(); - } - - @Test - public void testIntervals() { - int secondsPerInterval = 60; - processor.setSecondsPerInterval(secondsPerInterval); - for (int i = 0; i < secondsPerInterval; i++) { - assertFalse("interval of 60 seconds should return false for isIntervalElapsed from 0-59", processor.isIntervalElapsed(i)); - } - assertTrue("interval of 60 seconds should return true for isIntervalElapsed(60)", processor.isIntervalElapsed(60)); - assertFalse("should now return false for 60 seconds", processor.isIntervalElapsed(60)); - for (int i = 0; i < secondsPerInterval*2; i++) { - assertFalse("interval of 60 seconds should return false for isIntervalElapsed from 0-119", processor.isIntervalElapsed(i)); - } + @Override + public String getOutputFileExtension() { + return "-test-interval.txt"; + } + } + + private IntervalProcessor processor; + + @Before + public void setUp() { + processor = new IntervalProcessor(); + } + + @Test + public void testIntervals() { + long secondsPerInterval = 60; + processor.setSecondsPerInterval(secondsPerInterval); + for (long i = 0; i < secondsPerInterval; i++) { + assertFalse("interval of 60 seconds should return false for isIntervalElapsed from 0-59", processor.isIntervalElapsed(i)); + } + assertTrue("interval of 60 seconds should return true for isIntervalElapsed(60)", processor.isIntervalElapsed(60)); + assertFalse("should now return false for 60 seconds", processor.isIntervalElapsed(60)); + for (long i = 0; i < secondsPerInterval*2; i++) { + assertFalse("interval of 60 seconds should return false for isIntervalElapsed from 0-119", processor.isIntervalElapsed(i)); + } assertTrue("interval of 60 seconds should return true for isIntervalElapsed(120)", processor.isIntervalElapsed(120)); assertFalse("interval has already elapsed for isIntervalElapsed(120)", processor.isIntervalElapsed(120)); - processor.resetCurrentInterval(); - for (int i = 0; i < secondsPerInterval; i++) { - assertFalse("after reset, interval of 60 seconds should return false for isIntervalElapsed from 0-60", processor.isIntervalElapsed(i)); - } - } + processor.resetCurrentInterval(); + for (long i = 0; i < secondsPerInterval; i++) { + assertFalse("after reset, interval of 60 seconds should return false for isIntervalElapsed from 0-60", processor.isIntervalElapsed(i)); + } + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-24 18:33:48
|
Revision: 478 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=478&view=rev Author: alllee Date: 2010-02-24 18:33:41 +0000 (Wed, 24 Feb 2010) Log Message: ----------- default for always explicit mode set to true Modified Paths: -------------- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java 2010-02-24 18:15:30 UTC (rev 477) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java 2010-02-24 18:33:41 UTC (rev 478) @@ -314,7 +314,7 @@ } public boolean isAlwaysInExplicitCollectionMode() { - return getBooleanProperty("always-explicit", false); + return getBooleanProperty("always-explicit", true); } public boolean isExplicitCollectionEnabled() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-24 04:38:16
|
Revision: 476 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=476&view=rev Author: alllee Date: 2010-02-24 04:38:10 +0000 (Wed, 24 Feb 2010) Log Message: ----------- adding mobile/field of view configuration Added Paths: ----------- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round0.xml foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round1.xml foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round2.xml foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round3.xml foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round4.xml foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round5.xml foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round6.xml foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/server.xml Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round0.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round0.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round0.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="resource-width">13</entry> +<entry key="resource-depth">13</entry> +<entry key="practice-round">true</entry> +<entry key="private-property">true</entry> +<entry key="duration">240</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='starting-tokens'>10</entry> +<entry key='dollars-per-token'>.10</entry> + +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key="quiz">true</entry> +<entry key="q1">C</entry> +<entry key="q2">B</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>General Instructions</h3> +<p> +You will appear on the screen as a yellow dot <img +src="@CODEBASE_URL@/images/gem-self.gif">, You can move by pressing the four arrow +keys on your keyboard. You can move either up, down, left, or right. You have to +press a key for each and every move of your yellow dot. In this experiment you can +collect green diamond shaped tokens +<img src="@CODEBASE_URL@/images/gem-token.gif"> and you will +earn two cents for each collected token. To collect a token, simply move your +yellow dot over a green token and press the <b>space bar</b>. If you move +over a token without pressing the <b>space bar</> you will NOT collect that +token. +</p> + +<p> +The tokens that you collect have the potential to regenerate. After you have +collected a green token, a new token can once again appear on that empty cell. +However, the rate at which new tokens will appear depends on the number of +adjacent cells that still have tokens. The more tokens in the 8 cells around +an empty cell, the faster a new token will appear on that empty cell. Existing +tokens can generate new tokens. Thus the middle cell in Image 1 denoted with X will +be regenerated at a faster rate than the middle cell in Image 2. When all +neighboring cells are empty, there is no renewal. + +<table width="100%"> +<tr> +<td align="center"><b>Image 1</b></td> +<td align="center"><b>Image 2</b></td> +</tr> +<tr> +<td align="center"> +<img src="@CODEBASE_URL@/images/8neighbors.jpg" alt="image 1"> +</td> +<td align="center"> +<img src="@CODEBASE_URL@/images/5neighbors.jpg" alt="image 2"> +</td> +</tr> +</table> +<hr> +<h3>Practice Round Instructions</h3> +<hr> +<p> +You will now have four minutes to practice with the experimental environment. +The decisions you make in this round will NOT influence your earnings. At the +At the beginning of the practice round half of the cells are occupied +with green tokens. The environment is a 13 x 13 grid of cells. +</p> +<p> +When you push the <b>R</b> key you will reset the distribution of +the tokens to randomly occupying half of the cells with green tokens. +</p> + +<p><center><b>Please do not communicate with any other participant.</b></center></p> +<p>If you have any questions please raise your hand. <b>Do you have any +questions so far?</b></p> +]]> +</entry> + +<entry key="quiz-instructions"> +<![CDATA[ +<p> +Before we begin the practice round you need to answer the following questions +correctly. You can only continue when you have answered all questions +correctly. If an error is made you will need to answer the questions again. +</p> +<br> +<form> +Which of the statements is incorrect? <br> +<input type="radio" name="q1" value="A">Your decisions of where to collect tokens affects the regeneration of tokens.<br> +<input type="radio" name="q1" value="B">When you have collected all tokens on +the screen, no new tokens will appear.<br> +<input type="radio" name="q1" value="C">Tokens grow from the middle of the +screen.<br> +<input type="radio" name="q1" value="D">In order to collect a token you need +to press the space bar while your avatar is on a cell with a token.<br> +<br><br> + +Which sequence of situations is not possible? <br> +<img src="@CODEBASE_URL@/images/question2.jpg"><br> +<input type="radio" name="q2" value="A">A<br> +<input type="radio" name="q2" value="B">B<br> +<input type="radio" name="q2" value="C">C<br> +<br> +<input type="submit" name="submit" value="Submit"> +</form> +]]> +</entry> +<entry key="welcome-instructions"> +<![CDATA[ +<h3>Welcome</h3> +<p> +Welcome. You have already earned 5 dollars for showing up at this experiment. +You can earn more, up to a maximum of 40 dollars, by participating in this +experiment, which will take about an hour. The amount of money you earn +depends on your decisions as well as the decisions of your group members +during the four rounds of the experiment. Please be patient while the rest of the +participants are seated, the experiment will begin shortly. +</p> +]]> +</entry> + +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round1.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round1.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round1.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="duration">240</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='starting-tokens'>10</entry> +<entry key='dollars-per-token'>.10</entry> + +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + + + +<entry key="instructions"> +<![CDATA[ +<h3>Round 1 Instructions</h3> +<hr> +<p> +This is the first round of the experiment. The length of the round is 4 +minutes. Like in the practice round you can collect green tokens. This time +you earn <b>two cents</b> for each token collected. This time you +<b>cannot</b> reset the distribution of green tokens. +</p> +<p> +In this round the renewable resource will become five times bigger. You +will share this larger environment with four other players in this room. +Each of you has been randomly assigned to one of several equal-sized +groups. Each of the groups is collecting tokens from an identical, but +separate resource. +</p> +<p> +Each of you has been assigned a number from 1 to 5. The other four players +will appear on the screen as blue dots +<img src="@CODEBASE_URL@/images/gem-other.gif"> with a white +number embedded in the dot. On the top right corner of the screen you can see +how many tokens each player has collected. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round2.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round2.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round2.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="duration">240</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> + + +<entry key='resource-generator'>mobile</entry> +<entry key='starting-tokens'>10</entry> +<entry key='dollars-per-token'>.10</entry> + +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 2 Instructions</h3> +<hr> +<p> +Round 2 is the same as round 1. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round3.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round3.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round3.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="duration">240</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- resource regrowth parameters --> +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<!-- +<entry key="patchy">true</entry> +<entry key="top-initial-distribution">0.50</entry> +<entry key="top-rate">0.02</entry> +<entry key="bottom-initial-distribution">0.25</entry> +<entry key="bottom-rate">0.01</entry> +--> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 3 Instructions</h3> +<hr> +<p> +Round 3 is the same as round 2. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round4.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round4.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round4.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> +<entry key="duration">240</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- before this round begins, we have a chat session --> +<entry key="chat-enabled">true</entry> +<entry key="chat-duration">240</entry> + +<!-- enable sanctioning --> +<entry key="sanction-type">real-time</entry> +<entry key="sanction-cost">1</entry> +<entry key="sanction-multiplier">2</entry> + + +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<!-- enable quiz --> +<entry key='quiz'>true</entry> +<entry key='q1'>1</entry> +<entry key='q2'>2</entry> +<entry key='q3'>1</entry> +<entry key='q4'>1</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 4 Instructions</h3> +<hr> +<p> +Round 4 is the same as the previous two rounds with two exceptions. +</p> +<p> +Before the next round starts you can anonymously communicate by text messages +for four minutes with the other participants in your group. You can use this +opportunity to discuss the experiment and coordinate your actions to improve +your earnings. You may not promise side-payments after the experiment is +completed or make any threats. You are also not allowed to reveal your real +identity. We are monitoring the chat traffic while you chat. +</p> +<p> +During the next round you will have the option to reduce the earnings of another +participant at a cost to your own earnings. +</p> +<ul> +<li>If you press the numeric key 1-5 corresponding to another participant, you +will reduce the number of tokens they have collected in this round by two +tokens. This will also reduce your own token amount by one token. The decision +whether or when to use this option is up to you. +<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>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>You may reduce the earnings of other participants as long as there are +tokens remaining on the screen and while 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>one</b>, and their token amount is reduced by +<b>two</b>. <b>Note:</b> You can only remove tokens from a participant that is +visible to you. +</ul> +<p> + +<p> +The length of this round is four minutes. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> + +<entry key="chat-instructions"> +<![CDATA[ +<p> +You can now chat with the other participants in your group for 4 minutes +total. During the chat round, you may communicate about any aspect of the +experiment that you would like to discuss with other participants with whom +you have been matched. You may not promise them side-payments after the +experiment is completed or threaten them with any consequence after the +experiment is finished. We are monitoring the chat traffic while you chat. If +we see that somebody reveals his or her identity, we have to stop the +experiment and remove the whole group from which this person is a member out +of this room. +</p> +<p> +You will see other participants labeled as "1", "2","3", "4", or "5" in the +chat box. You can send a chat message by typing into the textfield at the +bottom of the screen and clicking the "send" button with your mouse or +pressing the "enter" key on your keyboard. +</p> +]]> +</entry> +<entry key="quiz-instructions"> +<![CDATA[ +<p>Before the next round begins you must complete the quiz below. You can +only continue when you have answered all questions correctly. If an error is +made you will need to answer the questions again. +</p> + +<form> +Each time I press the numeric keys between 1-5 my tokens will be reduced +by:<br> +<input type="radio" name="q1" value="0">0 tokens<br> +<input type="radio" name="q1" value="1">1 token<br> +<input type="radio" name="q1" value="2">2 tokens<br> +<input type="radio" name="q1" value="4">4 tokens<br> +<br><br> + +Each time I press the numeric keys between 1-5 the number of tokens of the +corresponding participant is reduced by:<br> +<input type="radio" name="q2" value="0">0 tokens<br> +<input type="radio" name="q2" value="1">1 token<br> +<input type="radio" name="q2" value="2">2 tokens<br> +<input type="radio" name="q2" value="4">4 tokens<br> +<br><br> + +The background of your avatar turns blue. What does this represent?<br> +<input type="radio" name="q3" value="0">You collected a token<br> +<input type="radio" name="q3" value="1">Another participant is subtracting two +tokens from you<br> +<input type="radio" name="q3" value="2">You are subtracting two tokens from another +participant<br> +<input type="radio" name="q3" value="3">You are moving too fast<br> +<br><br> + +Every time I press the numeric keys between 1-5:<br> +<input type="radio" name="q4" value="0">Two tokens are subtracted from my tokens +collected this round<br> +<input type="radio" name="q4" value="1">One token is subtracted from my tokens +collected this round<br> +<input type="radio" name="q4" value="2">The background of my avatar turns blue +momentarily<br> +<input type="radio" name="q4" value="3">My avatar is paused for two seconds<br> + +<input type="submit" name="submit" value="Submit"> +</form> +]]> +</entry> + +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round5.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round5.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round5.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> +<entry key="duration">240</entry> + +<!-- enable mobile offspring-generating resource --> +<entry key='resource-generator'>mobile</entry> +<!-- enable field of vision for tokens and subjects --> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> + +<!-- enable sanctioning --> +<entry key="sanction-type">real-time</entry> +<entry key="sanction-cost">1</entry> +<entry key="sanction-multiplier">2</entry> + +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- before this round begins, we have a chat session --> +<entry key="chat-enabled">true</entry> +<entry key="chat-duration">240</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 5 Instructions</h3> +<hr> +<p> +Round 5 is the same as round 4.</p> +<p> +The length of this round is again four minutes. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> + +<entry key="chat-instructions"> +<![CDATA[ +<p> +You can now chat with the other participants in your group for 4 minutes +total. During the chat round, you may communicate about any aspect of the +experiment that you would like to discuss with other participants with whom +you have been matched. You may not promise them side-payments after the +experiment is completed or threaten them with any consequence after the +experiment is finished. We are monitoring the chat traffic while you chat. If +we see that somebody reveals his or her identity, we have to stop the +experiment and remove the whole group from which this person is a member out +of this room. +</p> +<p> +You will see other participants labeled as "1", "2","3", "4", or "5" in the +chat box. You can send a chat message by typing into the textfield at the +bottom of the screen and clicking the "send" button with your mouse or +pressing the "enter" key on your keyboard. +</p> +]]> +</entry> + +<entry key='private-chat-instructions'> +<![CDATA[ +You may send private messages to a specific participant by clicking on the +appropriately labeled button (1, 2, 3, 4, or 5) before typing your message in +the chat box and sending it. By default you are communicating with all +members of your group. +]]> +</entry> + +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round6.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round6.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/round6.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Foraging XML-ized experiment round configuration</comment> +<entry key="display-group-tokens">true</entry> +<entry key="clients-per-group">5</entry> +<entry key="resource-depth">29</entry> +<entry key="resource-width">29</entry> +<entry key="duration">240</entry> + +<entry key='resource-generator'>mobile</entry> +<entry key='tokens-field-of-vision'>true</entry> +<entry key='subjects-field-of-vision'>true</entry> +<!-- enable sanctioning --> +<entry key="sanction-type">real-time</entry> +<entry key="sanction-cost">1</entry> +<entry key="sanction-multiplier">2</entry> + +<entry key="initial-distribution">.25</entry> +<entry key="regrowth-rate">0.01</entry> + +<entry key='always-explicit'>true</entry> +<entry key='max-cell-occupancy'>1</entry> + +<!-- before this round begins, we have a chat session --> +<entry key="chat-enabled">true</entry> +<entry key="chat-duration">240</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 6 Instructions</h3> +<hr> +<p> +Round 6 is the same as round 5.</p> +<p> +The length of this round is again four minutes. +</p> +<p> +If you have any questions please raise your hand. <b>Do you have any +questions so far?</b> +</p> +]]> +</entry> + +<entry key="last-round-debriefing"> +<![CDATA[ +<p> +This was the last round, but not the end of the experiment. We will now +determine your payments. While we are doing this, we request that you +carefully fill out a brief survey. +</p> +<p> +When we are ready we will call you one by one to the room next door. We will +pay you there in private. Please wait until your computer number is called, +and then proceed to the room next door to turn in your computer number and +your survey. +</p> +<p> +Please answer the survey carefully and thank you for participating. +</p> +]]> +</entry> + +<entry key="chat-instructions"> +<![CDATA[ +<p> +You can now chat with the other participants in your group for 4 minutes +total. During the chat round, you may communicate about any aspect of the +experiment that you would like to discuss with other participants with whom +you have been matched. You may not promise them side-payments after the +experiment is completed or threaten them with any consequence after the +experiment is finished. We are monitoring the chat traffic while you chat. If +we detect that somebody has revealed their identity, we will have to stop the +experiment and remove that person's entire group from the experiment. +</p> +<p> +You will see other participants labeled as "1", "2","3", "4", or "5" in the +chat box. You can send a chat message by typing into the textfield at the +bottom of the screen and clicking the "send" button with your mouse or +pressing the "enter" key on your keyboard. </p> +]]> +</entry> +</properties> Added: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/server.xml =================================================================== --- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/server.xml (rev 0) +++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov/server.xml 2010-02-24 04:38:10 UTC (rev 476) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Costly Sanctioning XML-ized experiment round configuration</comment> +<entry key="hostname">@SERVER_ADDRESS@</entry> +<entry key="port">@PORT_NUMBER@</entry> +<entry key="round0">round0.xml</entry> +<entry key="round1">round1.xml</entry> +<entry key="round2">round2.xml</entry> +<entry key="round3">round3.xml</entry> +<entry key="round4">round4.xml</entry> +<entry key="round5">round5.xml</entry> +<entry key="round6">round6.xml</entry> +<entry key="wait-for-participants">true</entry> +<entry key="number-of-rounds">7</entry> +<entry key="facilitator-instructions"> +<![CDATA[ +<h3>Facilitator Instructions</h3> +<p> +Welcome to the facilitator interface. This interface allows you to control +the experiment. You may only modify configuration parameters <b>before</b> +you start the experiment by selecting the Configuration menu. When all the +participants are ready to begin the experiment, you can start the experiment +by selecting Experiment -> Start. After a round has been completed you +will be able to view the statistics for all of the participants. You can +begin the next round by selecting Round -> Start. +</p> +]]> +</entry> +</properties> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-24 00:39:54
|
Revision: 475 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=475&view=rev Author: alllee Date: 2010-02-24 00:39:44 +0000 (Wed, 24 Feb 2010) Log Message: ----------- using ImageIO.read instead of Toolkit.getImage which seems to have improved the image loading bug. updating resource generation to allow for an initial number of tokens parameter. Modified Paths: -------------- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java 2010-02-18 05:29:50 UTC (rev 474) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java 2010-02-24 00:39:44 UTC (rev 475) @@ -7,10 +7,11 @@ import java.awt.Graphics2D; import java.awt.Image; import java.awt.Point; -import java.awt.Toolkit; import java.awt.image.ImageObserver; +import java.io.IOException; import java.util.Collection; +import javax.imageio.ImageIO; import javax.swing.JPanel; import edu.asu.commons.foraging.conf.RoundConfiguration; @@ -150,7 +151,13 @@ } private Image loadImage(String path) { - return Toolkit.getDefaultToolkit().getImage(ResourceLoader.getResourceAsUrl(path)); + try { + return ImageIO.read(ResourceLoader.getResourceAsUrl(path)); + } + catch (IOException exception) { + return null; + } +// return Toolkit.getDefaultToolkit().getImage(ResourceLoader.getResourceAsUrl(path)); } protected void paintComponent(Graphics graphics) { Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java 2010-02-18 05:29:50 UTC (rev 474) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java 2010-02-24 00:39:44 UTC (rev 475) @@ -22,7 +22,7 @@ private static final double DEFAULT_DOLLARS_PER_TOKEN = .02d; - private static final double DEFAULT_TOKEN_MOVEMENT_PROBABILITY = 0.02d; + private static final double DEFAULT_TOKEN_MOVEMENT_PROBABILITY = 0.2d; private static final double DEFAULT_TOKEN_BIRTH_PROBABILITY = 0.01d; @@ -132,6 +132,11 @@ public double getRegrowthRate() { return getDoubleProperty("regrowth-rate", DEFAULT_REGROWTH_RATE); } + + public int getInitialNumberOfTokens() { + return getIntProperty("starting-tokens", + (int) (getInitialDistribution() * getResourceWidth() * getResourceDepth())); + } public double getInitialDistribution() { return getDoubleProperty("initial-distribution", 0.5d); Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java 2010-02-18 05:29:50 UTC (rev 474) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java 2010-02-24 00:39:44 UTC (rev 475) @@ -26,8 +26,8 @@ RoundConfiguration configuration = group.getRoundConfiguration(); int width = configuration.getResourceWidth(); int height = configuration.getResourceDepth(); - double initialDistribution = configuration.getInitialDistribution(); - int tokensNeeded = (int) (width * height * initialDistribution); + int tokensNeeded = configuration.getInitialNumberOfTokens(); + // FIXME: should this logic be parameterized as well boolean ageMatters = ! configuration.is2dExperiment(); int maximumResourceAge = configuration.getMaximumResourceAge(); boolean shouldVaryAge = maximumResourceAge > 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-18 05:30:00
|
Revision: 474 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=474&view=rev Author: alllee Date: 2010-02-18 05:29:50 +0000 (Thu, 18 Feb 2010) Log Message: ----------- updated water variability for treatment 4 Modified Paths: -------------- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>26</entry> +<entry key='max-canal-flow-capacity'>22</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>35</entry> +<entry key='max-canal-flow-capacity'>36</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>33</entry> +<entry key='max-canal-flow-capacity'>25</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>28</entry> +<entry key='max-canal-flow-capacity'>32</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>29</entry> +<entry key='max-canal-flow-capacity'>38</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>25</entry> +<entry key='max-canal-flow-capacity'>21</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>34</entry> +<entry key='max-canal-flow-capacity'>29</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml 2010-02-13 00:39:40 UTC (rev 473) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml 2010-02-18 05:29:50 UTC (rev 474) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>32</entry> +<entry key='max-canal-flow-capacity'>39</entry> <entry key="instructions"> <![CDATA[ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Allen L. (JIRA) <jef...@as...> - 2010-02-15 15:14:04
|
NPE in registerSignup when invitation doesn't exist (?) ------------------------------------------------------- Key: COMMONS-23 URL: http://opensource.asu.edu/jira/browse/COMMONS-23 Project: The Virtual Commons Issue Type: Bug Components: subject-pool Reporter: Allen Lee Assignee: Allen Lee Priority: Blocker 08:09:42,028 - DEBUG edu.asu.shesc.service.ParticipantService - checking if username: kscolin exists in database 08:09:42,056 - ERROR org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/].[default] - Servlet.service() for servlet default threw exception java.lang.NullPointerException at edu.asu.shesc.action.RegisterSignup.execute(RegisterSignup.java:45) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at com.opensymphony.xwork.DefaultActionInvocation.invokeAction(DefaultActionInvocation.java:358) at com.opensymphony.xwork.DefaultActionInvocation.invokeActionOnly(DefaultActionInvocation.java:218) at com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:192) at com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor.doIntercept(DefaultWorkflowInterceptor.java:175) at com.opensymphony.xwork.interceptor.MethodFilterInterceptor.intercept(MethodFilterInterceptor.java:86) at com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190) at com.opensymphony.xwork.validator.ValidationInterceptor.doIntercept(ValidationInterceptor.java:115) at com.opensymphony.xwork.interceptor.MethodFilterInterceptor.intercept(MethodFilterInterceptor.java:86) at com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190) at com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31) at com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
From: <al...@us...> - 2010-02-13 00:39:50
|
Revision: 473 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=473&view=rev Author: alllee Date: 2010-02-13 00:39:40 +0000 (Sat, 13 Feb 2010) Log Message: ----------- ints -> longs for interval processing, should refactor MovieCreatorProcessor to use SaveFileProcessor.Base's interval logic instead Modified Paths: -------------- foraging/trunk/pom.xml foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreatorProcessor.java Modified: foraging/trunk/pom.xml =================================================================== --- foraging/trunk/pom.xml 2010-02-13 00:37:31 UTC (rev 472) +++ foraging/trunk/pom.xml 2010-02-13 00:39:40 UTC (rev 473) @@ -4,6 +4,26 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <organization> + <name>The Virtual Commons</name> + <url>http://commons.asu.edu</url> + </organization> + <developers> + <developer> + <id>allen</id> + <name>Allen Lee</name> + <email>all...@as...</email> + <url>http://libai.la.asu.edu/allen.lee</url> + <organization>Center for the Study of Institutional Diversity</organization> + <organizationUrl>http://csid.asu.edu</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + <role>manager</role> + </roles> + <timezone>-7</timezone> + </developer> + </developers> <modelVersion>4.0.0</modelVersion> <groupId>edu.asu.commons</groupId> <artifactId>foraging</artifactId> @@ -24,6 +44,10 @@ <scm> <url>https://virtualcommons.svn.sourceforge.net/svnroot/virtualcommons/foraging</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://opensource.asu.edu/jira/browse/COMMONS</url> + </issueManagement> <repositories> <repository> <id>dev.commons.asu.edu</id> Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java 2010-02-13 00:37:31 UTC (rev 472) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java 2010-02-13 00:39:40 UTC (rev 473) @@ -624,7 +624,7 @@ collectedTokenNeighbors.put(id, neighbors); } for (PersistableEvent event: savedRoundData.getActions()) { - int elapsedTimeInSeconds = savedRoundData.getElapsedTimeInSeconds(event); + long elapsedTimeInSeconds = savedRoundData.getElapsedTimeInSeconds(event); if (isIntervalElapsed(elapsedTimeInSeconds)) { writeAggregateStatistics(writer, collectedTokenNeighbors); @@ -733,7 +733,7 @@ writer.println(header); for (PersistableEvent event: savedRoundData.getActions()) { - int secondsElapsed = savedRoundData.getElapsedTimeInSeconds(event); + long secondsElapsed = savedRoundData.getElapsedTimeInSeconds(event); // see if the current persistable event is past the threshold, // meaning we should take a snapshot of our currently // accumulated stats Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreatorProcessor.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreatorProcessor.java 2010-02-13 00:37:31 UTC (rev 472) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/util/MovieCreatorProcessor.java 2010-02-13 00:39:40 UTC (rev 473) @@ -75,7 +75,7 @@ jframe.setVisible(true); jframes.add(jframe); } - int secondHasPassedCheck = -1; + long secondHasPassedCheck = -1; // grab out all add client events to initialize the state of the game properly. for (PersistableEvent event: savedRoundData.getActions()) { if (event instanceof AddClientEvent) { @@ -84,7 +84,7 @@ } } for (PersistableEvent event: savedRoundData.getActions()) { - final int elapsedTimeInSeconds = savedRoundData.getElapsedTimeInSeconds(event); + final long elapsedTimeInSeconds = savedRoundData.getElapsedTimeInSeconds(event); System.err.println("elapsed time in seconds: " + elapsedTimeInSeconds + ":" + event); serverDataModel.apply(event); if (elapsedTimeInSeconds > secondHasPassedCheck) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-13 00:37:37
|
Revision: 472 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=472&view=rev Author: alllee Date: 2010-02-13 00:37:31 +0000 (Sat, 13 Feb 2010) Log Message: ----------- updated server configuration and save file converter for updated csidex Modified Paths: -------------- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java 2010-02-12 22:44:32 UTC (rev 471) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java 2010-02-13 00:37:31 UTC (rev 472) @@ -34,7 +34,7 @@ } @Override - protected RoundConfiguration createConfiguration(String roundConfigurationResource) { + protected RoundConfiguration createRoundConfiguration(String roundConfigurationResource) { return new RoundConfiguration(roundConfigurationResource); } Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java =================================================================== --- foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java 2010-02-12 22:44:32 UTC (rev 471) +++ foraging/trunk/src/main/java/edu/asu/commons/foraging/util/ForagingSaveFileConverter.java 2010-02-13 00:37:31 UTC (rev 472) @@ -283,7 +283,7 @@ clientSpatialDistributionMap.put(clientData.getId(), new ClientSpatialDistribution(boardSize)); } for (PersistableEvent event : actions) { - int elapsedTime = savedRoundData.getElapsedTimeInSeconds(event); + long elapsedTime = savedRoundData.getElapsedTimeInSeconds(event); if (isIntervalElapsed(elapsedTime)) { writeData(writer, serverDataModel, clientSpatialDistributionMap); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-12 22:44:39
|
Revision: 471 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=471&view=rev Author: alllee Date: 2010-02-12 22:44:32 +0000 (Fri, 12 Feb 2010) Log Message: ----------- changing interval processing to use longs instead of ints Modified Paths: -------------- csidex/trunk/src/main/java/edu/asu/commons/experiment/SaveFileProcessor.java Modified: csidex/trunk/src/main/java/edu/asu/commons/experiment/SaveFileProcessor.java =================================================================== --- csidex/trunk/src/main/java/edu/asu/commons/experiment/SaveFileProcessor.java 2010-02-11 23:58:59 UTC (rev 470) +++ csidex/trunk/src/main/java/edu/asu/commons/experiment/SaveFileProcessor.java 2010-02-12 22:44:32 UTC (rev 471) @@ -42,9 +42,9 @@ // FIXME: not thread safe for concurrent usage when reusing the same SaveFileProcessor in multiple threads // on multiple save files. - private int secondsPerInterval; - private int currentInterval = 0; - private int intervalEnd = 0; + private long secondsPerInterval; + private long currentInterval = 0; + private long intervalEnd = 0; private String roundSaveFile; @@ -56,7 +56,7 @@ this.secondsPerInterval = secondsPerInterval; } - public boolean isIntervalElapsed(int secondsElapsed) { + public boolean isIntervalElapsed(long secondsElapsed) { intervalEnd = (currentInterval + 1) * secondsPerInterval; if (secondsElapsed >= intervalEnd) { currentInterval++; @@ -69,7 +69,7 @@ * Returns the total number of seconds that must elapse before the current interval ends (e.g., 60, 120, 180). * @return the total number of seconds that must elapse before the current interval ends */ - protected int getIntervalEnd() { + protected long getIntervalEnd() { return intervalEnd; } @@ -77,7 +77,7 @@ currentInterval = 0; } - public void setSecondsPerInterval(int secondsPerInterval) { + public void setSecondsPerInterval(long secondsPerInterval) { this.secondsPerInterval = secondsPerInterval; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-11 23:59:06
|
Revision: 470 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=470&view=rev Author: alllee Date: 2010-02-11 23:58:59 +0000 (Thu, 11 Feb 2010) Log Message: ----------- updated configuration and instructions for variable water supply treatment Modified Paths: -------------- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round12.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round13.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round14.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round15.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round16.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round17.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round18.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round19.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round20.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round21.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round11.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round12.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round13.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml Added Paths: ----------- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round12.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round12.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round12.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -2,24 +2,23 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>20</entry> +<entry key='reset-infrastructure-efficiency'>true</entry> +<entry key='max-canal-flow-capacity'>27</entry> + <entry key="instructions"> <![CDATA[ <h3>Round 11 Instructions</h3> <p> -In the past rounds the infrastructure efficiency declined from one round to -the next at a constant amount of 25%. In the following rounds the <b>average -decline</b> of the infrastructure efficiency will remain the same, but the -<b>actual amount</b> of decline can vary from round to round. This means that -in some rounds the decline will be larger than 25% and some rounds the decline -will be smaller than 25%. Before each round begins you will continue to make a -decision on how much to invest in the irrigation infrastructure. After all of -your investment contributions have been submitted the resulting level of -infrastructure efficiency will be displayed and then the round will begin. If -you have any questions, please ask them now. +In the past rounds the water supply was stable at a level of 30 cubic +feet per second for each round. In the following rounds the average water +supply remains 30 cfps, but the actual water supply varies each round +between 25 cfps and 35 cfps. After you have made your investment decisions, +the infrastructure level is announced as well as the actual water supply for +that round. Please remember that the water supply is independent of your +irrigation capacity. If you develop an irrigation capacity of 30 cfps but the +water supply is only 20 cfps, you are only getting 20 cfps down your canal. </p> - ]]> </entry> </properties> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round13.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round13.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round13.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>30</entry> +<entry key='max-canal-flow-capacity'>31</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round14.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round14.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round14.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>25</entry> +<entry key='max-canal-flow-capacity'>26</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round15.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round15.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round15.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -2,8 +2,9 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>20</entry> +<entry key='max-canal-flow-capacity'>35</entry> + <entry key="instructions"> <![CDATA[ <h3>Round 14 Instructions</h3> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round16.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round16.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round16.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -2,8 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>35</entry> +<entry key='max-canal-flow-capacity'>33</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round17.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round17.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round17.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -2,7 +2,9 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>20</entry> + +<entry key='max-canal-flow-capacity'>28</entry> + <entry key="instructions"> <![CDATA[ <h3>Round 16 Instructions</h3> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round18.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round18.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round18.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -2,8 +2,9 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>15</entry> +<entry key='max-canal-flow-capacity'>29</entry> + <entry key="instructions"> <![CDATA[ <h3>Round 17 Instructions</h3> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round19.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round19.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round19.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -2,8 +2,8 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>30</entry> +<entry key='max-canal-flow-capacity'>25</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round20.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round20.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round20.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>30</entry> +<entry key='max-canal-flow-capacity'>34</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round21.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round21.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t3/round21.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,7 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='infrastructure-degradation-factor'>25</entry> +<entry key='max-canal-flow-capacity'>32</entry> <entry key="instructions"> <![CDATA[ Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round11.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round11.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round11.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,7 +3,6 @@ <properties> <comment>Irrigation experiment round configuration</comment> - <entry key="instructions"> <![CDATA[ <h3>Round 10 Instructions</h3> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round12.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round12.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round12.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,6 +3,7 @@ <properties> <comment>Irrigation experiment round configuration</comment> +<entry key='reset-infrastructure-efficiency'>true</entry> <entry key='max-canal-flow-capacity'>27</entry> <entry key="instructions"> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round13.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round13.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round13.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -9,7 +9,7 @@ <![CDATA[ <h3>Round 12 Instructions</h3> <p> -This round is the same as previous rounds. +This round is the same as the previous round. </p> ]]> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round14.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,14 +3,13 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>22</entry> +<entry key='max-canal-flow-capacity'>26</entry> - <entry key="instructions"> <![CDATA[ <h3>Round 13 Instructions</h3> <p> -This round is the same as previous rounds. +This round is the same as the previous round. </p> ]]> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round15.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,13 +3,13 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>36</entry> +<entry key='max-canal-flow-capacity'>35</entry> <entry key="instructions"> <![CDATA[ <h3>Round 14 Instructions</h3> <p> -This round is the same as previous rounds. +This round is the same as the previous round. </p> ]]> Modified: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml 2010-02-10 06:38:47 UTC (rev 469) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round16.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -3,13 +3,13 @@ <properties> <comment>Irrigation experiment round configuration</comment> -<entry key='max-canal-flow-capacity'>25</entry> +<entry key='max-canal-flow-capacity'>33</entry> <entry key="instructions"> <![CDATA[ <h3>Round 15 Instructions</h3> <p> -This round is the same as the previous rounds. +This round is the same as the previous round. </p> ]]> Added: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml (rev 0) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round17.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Irrigation experiment round configuration</comment> + +<entry key='max-canal-flow-capacity'>28</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 16 Instructions</h3> +<p> +This round is the same as the previous round. +</p> + +]]> +</entry> +</properties> Added: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml (rev 0) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round18.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Irrigation experiment round configuration</comment> + +<entry key='max-canal-flow-capacity'>29</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 17 Instructions</h3> +<p> +This round is the same as the previous round. +</p> + +]]> +</entry> +</properties> Added: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml (rev 0) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round19.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Irrigation experiment round configuration</comment> + +<entry key='max-canal-flow-capacity'>25</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 18 Instructions</h3> +<p> +This round is the same as the previous round. +</p> + +]]> +</entry> +</properties> Added: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml (rev 0) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round20.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Irrigation experiment round configuration</comment> + +<entry key='max-canal-flow-capacity'>34</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 19 Instructions</h3> +<p> +This round is the same as the previous round. +</p> + +]]> +</entry> +</properties> Added: irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml =================================================================== --- irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml (rev 0) +++ irrigation/trunk/src/main/resources/configuration/asu-fall-2009/t4/round21.xml 2010-02-11 23:58:59 UTC (rev 470) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +<comment>Irrigation experiment round configuration</comment> + +<entry key='max-canal-flow-capacity'>32</entry> + +<entry key="instructions"> +<![CDATA[ +<h3>Round 20 Instructions</h3> +<p> +This is the final round. +</p> +]]> +</entry> +</properties> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2010-02-10 06:38:53
|
Revision: 469 http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=469&view=rev Author: alllee Date: 2010-02-10 06:38:47 +0000 (Wed, 10 Feb 2010) Log Message: ----------- updated save file converter to include additional group summary stats Modified Paths: -------------- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/data/IrrigationSaveFileConverter.java irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/GroupDataModel.java Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/data/IrrigationSaveFileConverter.java =================================================================== --- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/data/IrrigationSaveFileConverter.java 2010-02-09 00:53:10 UTC (rev 468) +++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/data/IrrigationSaveFileConverter.java 2010-02-10 06:38:47 UTC (rev 469) @@ -89,7 +89,7 @@ ServerDataModel serverDataModel = (ServerDataModel) savedRoundData.getDataModel(); RoundConfiguration roundConfiguration = (RoundConfiguration) savedRoundData.getRoundParameters(); ArrayList<GroupDataModel> groups = new ArrayList<GroupDataModel>(serverDataModel.getAllGroupDataModels()); - writer.println("Group, Total group tokens earned, Water availability, Water supply, Tokens invested"); + writer.println("Group, Total group tokens earned, Water availability, Water supply, Tokens invested, Infrastructure before investment, Total infrastructure efficiency, % infrastructure decline"); for (GroupDataModel group: groups) { int totalGroupTokensEarned = 0; int totalGroupTokenInvestment = 0; @@ -97,12 +97,16 @@ totalGroupTokensEarned += data.getAllTokensEarnedThisRound(); totalGroupTokenInvestment += data.getInvestedTokens(); } - writer.println(String.format("%s, %d, %d, %d, %d", + writer.println(String.format("%s, %d, %d, %d, %d, %d, %d, %d", groups.indexOf(group), totalGroupTokensEarned, group.getIrrigationCapacity(), roundConfiguration.getWaterSupplyCapacity(), - totalGroupTokenInvestment)); + totalGroupTokenInvestment, + group.getInfrastructureEfficiencyBeforeInvestment(), + group.getInfrastructureEfficiency(), + roundConfiguration.getInfrastructureDegradationFactor() + )); } Map<GroupDataModel, SortedSet<ChatRequest>> chatRequestMap = new HashMap<GroupDataModel, SortedSet<ChatRequest>>(); SortedSet<ChatRequest> allChatRequests = savedRoundData.getChatRequests(); Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/GroupDataModel.java =================================================================== --- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/GroupDataModel.java 2010-02-09 00:53:10 UTC (rev 468) +++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/GroupDataModel.java 2010-02-10 06:38:47 UTC (rev 469) @@ -199,25 +199,25 @@ return maximumAvailableWaterFlow; } - public int getInfrastructureEfficiency() { - return infrastructureEfficiency; - } + public int getInfrastructureEfficiency() { + return infrastructureEfficiency; + } - public int getInfrastructureEfficiencyBeforeInvestment() { - return infrastructureEfficiencyBeforeInvestment; - } - - public Logger getLogger() { - if (logger == null) { - logger = Logger.getLogger(getClass().getName()); - } - return logger; - } - - + public int getInfrastructureEfficiencyBeforeInvestment() { + return infrastructureEfficiencyBeforeInvestment; + } + + public Logger getLogger() { + if (logger == null) { + logger = Logger.getLogger(getClass().getName()); + } + return logger; + } + + public void setRoundConfiguration(RoundConfiguration roundConfiguration) { - this.roundConfiguration = roundConfiguration; - } + this.roundConfiguration = roundConfiguration; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Allen L. (JIRA) <jef...@as...> - 2010-02-10 06:38:01
|
[ http://opensource.asu.edu/jira/browse/COMMONS-21?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Allen Lee deleted COMMONS-21: ----------------------------- > students already participated report > ------------------------------------ > > Key: COMMONS-21 > URL: http://opensource.asu.edu/jira/browse/COMMONS-21 > Project: The Virtual Commons > Issue Type: Improvement > Reporter: Allen Lee > Assignee: Allen Lee > > Add a students already participated report generating a list of students that have already participated in the experiment. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.asu.edu/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |