[virtualcommons-svn] commit/irrigation: alllee: fixes issue 17 and changing server / round configur
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/irrigation: alllee: fixes issue 17 and changing server / round configurations to reflect upstream csidex changes
|
From: Bitbucket <com...@bi...> - 2012-03-07 23:58:22
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/608c5d7d8e8c/ changeset: 608c5d7d8e8c user: alllee date: 2012-03-08 00:58:23 summary: fixes issue 17 and changing server / round configurations to reflect upstream csidex changes affected #: 4 files diff -r dcb346d0714e129304d5358999e9fe4d4fcd46e4 -r 608c5d7d8e8c73b32edca6913a2b5306d557cf59 src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java @@ -19,7 +19,7 @@ * @author <a href='mailto:All...@as...'>Allen Lee</a> * @version $Rev$ */ -public class RoundConfiguration extends ExperimentRoundParameters.Base<ServerConfiguration> { +public class RoundConfiguration extends ExperimentRoundParameters.Base<ServerConfiguration, RoundConfiguration> { private static final long serialVersionUID = -5053624886508752562L; private String specialInstructions; diff -r dcb346d0714e129304d5358999e9fe4d4fcd46e4 -r 608c5d7d8e8c73b32edca6913a2b5306d557cf59 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -18,7 +18,7 @@ * @author <a href='mailto:All...@as...'>Allen Lee</a> * @version $Revision$ */ -public class ServerConfiguration extends ExperimentConfiguration.Base<RoundConfiguration> { +public class ServerConfiguration extends ExperimentConfiguration.Base<ServerConfiguration, RoundConfiguration> { private static final double DEFAULT_QUIZ_CORRECT_ANSWER_REWARD = 0.50d; diff -r dcb346d0714e129304d5358999e9fe4d4fcd46e4 -r 608c5d7d8e8c73b32edca6913a2b5306d557cf59 src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java --- a/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java +++ b/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java @@ -271,7 +271,7 @@ } }); addEventProcessor(new EventTypeProcessor<QuizResponseEvent>(QuizResponseEvent.class) { - private int numberOfCompletedQuizzes = 0; + private volatile int numberOfCompletedQuizzes = 0; @Override public void handle(QuizResponseEvent quizResponseEvent) { sendFacilitatorMessage("Received quiz response: " + quizResponseEvent); diff -r dcb346d0714e129304d5358999e9fe4d4fcd46e4 -r 608c5d7d8e8c73b32edca6913a2b5306d557cf59 src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -68,7 +68,7 @@ <hr><p> You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 25 dollars, by participating in this +can earn more, up to a maximum of about 45 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 AND the decisions of other people in this room over the course of the experiment. @@ -152,30 +152,31 @@ <entry key="quiz-instructions"><![CDATA[ +<h2>Quiz</h2> +<hr><p> The first two questions deal with irrigation infrastructure investment. <b>Please refer to Table 1 of your handout</b>. </p><form> -Question 1:<br> +<p>Question 1:<br> Given an existing infrastructure efficiency of 20%, if the five participants invest a <b>total of 29 additional tokens</b>, what is the new irrigation infrastructure efficiency?<br><input type="text" name="q1" value = "">% -<br><br> - -Question 2:<br> +</p> +<p>Question 2:<br> Suppose the infrastructure efficiency in the last round was 60%. For the current round, the efficiency will decline by an amount of 25% for a resulting infrastructure efficiency of 35%. If the members of your group invest a total of 15 tokens, what will be your group's resulting water delivery capacity?<br> - <input type="text" name="q2" value = ""> cubic feet per second -<br><br> - -<b>The next two questions deal with the capacity of the irrigation system in relation -to the actual amount of water available.</b> -<br><br> +</p> +<p> +The next two questions deal with the capacity of the irrigation system in relation +to the actual amount of water available. +</p> +<p> Question 3:<br> If the irrigation efficiency is between 71 and 80%, the water delivery capacity of the irrigation system is 35 cubic feet per second. Suppose the water supply @@ -184,30 +185,29 @@ B? <br><input type='text' name='q3' value=''> cubic feet per second -<br><br> -Question 4: +</p> +<p>Question 4:<br> If the available water delivery capacity is 25 cubic feet per second and A, B, C, and D are not using water, how much cubic feet of water per second is available for E?<br><input type='text' name='q4' value=''> cubic feet per second -<br><br> +</p><p> The final two questions cover the number of tokens you can earn in within a round. -<b>Please refer to table 2 of your handout</b>. +<b>Please refer to Table 2 of your handout</b>. </p> -Question 5:<br> +<p>Question 5:<br> If you invest 7 of the 10 tokens you start with and you apply 202 cubic feet of water to your fields, what is the total number of tokens you will have earned at the end of the round?<br><input type="text" name="q5" value="">tokens -<br><br> -Question 6:<br> +</p> +<p>Question 6:<br> If you invest all 10 tokens you start with and you apply 555 cubic feet of water to your fields, what is the total number of tokens you will have earned at the end of the round?<br><input type="text" name="q6" value="">tokens -<br><br> - +</p><input type="submit" name="submit" value="Submit"><br></form> ]]> @@ -506,72 +506,58 @@ incorrectly are highlighted in red. Please see below for more details. {endif} </p> - <br> - <hr> - <span class='q1'>Question 1:</span><br> + <hr> + <p><span class='q1'>Question 1:</span><br> Given an existing infrastructure efficiency of 20%, if the five participants invest a <b>total of 29 additional tokens</b>, what is the new irrigation infrastructure efficiency? <br><b>{incorrect_q1} - An existing infrastructure efficiency of 20% + 29 tokens invested = 49% infrastructure efficiency. - </b> - <br> - - <span class='q2'>Question 2:</span><br> - Suppose the infrastructure efficiency in the last round was 60%. For the current - round, the efficiency will decline by an amount of 25% for a resulting - infrastructure efficiency of 35%. If the members of your group invest a total of 15 - tokens, what will be your group's resulting water delivery capacity?<br> + An existing infrastructure efficiency of 20% + 29 tokens invested = 49% infrastructure efficiency.</b> + </p> + <p><span class='q2'>Question 2:</span><br> + Suppose the infrastructure efficiency in the last round was 60%. For the current + round, the efficiency will decline by an amount of 25% for a resulting + infrastructure efficiency of 35%. If the members of your group invest a total of 15 + tokens, what will be your group's resulting water delivery capacity?<br><b>{incorrect_q2} An existing infrastructure efficiency of 35% + 15 tokens invested = 50% infrastructure efficiency for the current round. An infrastructure efficiency of 50% corresponds to a water delivery capacity of 5 cubic feet per second.</b> - <br><br><br> - -<b>The next two questions deal with the capacity of the irrigation system in relation -to the actual amount of water available.</b> -<br><br> - <span class='q3'>Question 3:</span><br> + </p> + <p><span class='q3'>Question 3:</span><br> If the irrigation efficiency is between 71 and 80%, the water delivery capacity of the irrigation system is 35 cubic feet per second. Suppose the water supply available to your group is 30 cubic feet per second and A opens their gate, diverting water at 25 cubic feet per second. What is the available water flow for - B? - <br> - <b>{incorrect_q3} - Since there is only 30 cubic feet per second of water available, the irrigation infrastructure capacity of 35 cubic feet - per second will not be fully used. When A opens their gate, they take 25 of the 30 cubic feet per second out of the - canal, leaving 5 cubic feet per second for B. - </b> - <br><br><br> - <span class='q4'>Question 4:</span><br> - If the available water delivery capacity is 25 cubic feet per second and A, B, C, - and D are not using water, how much cubic feet of water per second is available for - E?<br> + B?<br> + <b>{incorrect_q3} + Since there is only 30 cubic feet per second of water available, the irrigation infrastructure capacity of 35 cubic feet + per second will not be fully used. When A opens their gate, they take 25 of the 30 cubic feet per second out of the + canal, leaving 5 cubic feet per second for B.</b> + </p> + <p><span class='q4'>Question 4:</span><br> + If the available water delivery capacity is 25 cubic feet per second and A, B, C, and D are not using water, how much cubic feet of water per second is available for E?<br><b>{incorrect_q4} If A has 25 cfps available and does not take any water, the same amount is available for the people downstream. Since B, C and D do not take water, 25 cfps is available for E. </b> - <br><br> -<p> -The final two questions cover the number of tokens you can earn in within a round. -<b>Please refer to table 2 of your handout</b>. -</p> -<span class='q5'>Question 5:</span><br> -If you invest 7 of the 10 tokens you start with and you apply 202 cubic feet of -water to your fields, what is the total number of tokens you will have earned at the -end of the round?<br> - <b>{incorrect_q5} - If you invest 7 out of 10 tokens, you keep 3 tokens for yourself. If you apply 202 cubic feet of water to your field you will earn 4 tokens. 3 + 4 = 7 tokens</b> - <br><br> -<span class='q6'>Question 6:</span><br> -If you invest all 10 tokens you start with and you apply 555 cubic feet of water to -your fields, what is the total number of tokens you will have earned at the end of -the round?<br> -<br> - <b>{incorrect_q6} - If you invest all 10 tokens, you keep 0 tokens from your initial endowment. If you apply 555 cubic feet of - water to your field you will earn 19 tokens. 0 + 19 = 19 tokens. - </b> + </p> + <p> + <span class='q5'>Question 5:</span><br> + If you invest 7 of the 10 tokens you start with and you apply 202 cubic feet of + water to your fields, what is the total number of tokens you will have earned at the + end of the round?<br> + <b>{incorrect_q5} + If you invest 7 out of 10 tokens, you keep 3 tokens for yourself. If you apply 202 cubic feet of water to your field you will earn 4 tokens. 3 + 4 = 7 tokens</b> + </p> + <p><span class='q6'>Question 6:</span><br> + If you invest all 10 tokens you start with and you apply 555 cubic feet of water to + your fields, what is the total number of tokens you will have earned at the end of + the round?<br> + <b>{incorrect_q6} + If you invest all 10 tokens, you keep 0 tokens from your initial endowment. If you apply 555 cubic feet of + water to your field you will earn 19 tokens. 0 + 19 = 19 tokens. + </b> + </p> ]]></entry></properties> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
