[virtualcommons-svn] commit/irrigation: alllee: merging bugfixes from default
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/irrigation: alllee: merging bugfixes from default
|
From: Bitbucket <com...@bi...> - 2012-03-27 03:57:06
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/0c1a63e38a60/ changeset: 0c1a63e38a60 branch: stable user: alllee date: 2012-03-27 05:57:05 summary: merging bugfixes from default affected #: 6 files diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 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 @@ -82,13 +82,17 @@ return getDoubleProperty("showup-payment", 5.0d); } + public double getMaximumPayment() { + return getDoubleProperty("maximum-payment", 40.0d); + } + public String getInitialInstructions() { ST template = createStringTemplate(getProperty("initial-instructions")); - template.groupThatCreatedThisInstance.registerRenderer(Number.class, new NumberRenderer()); NumberFormat formatter = NumberFormat.getCurrencyInstance(); template.add("showUpPayment", formatter.format(getShowUpPayment())); template.add("dollarsPerToken", formatter.format(getDollarsPerToken())); template.add("quizCorrectAnswerReward", formatter.format(getQuizCorrectAnswerReward())); + template.add("maximumPayment", formatter.format(getMaximumPayment())); return template.render(); } diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 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 @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, 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. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, 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. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, 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. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, 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. diff -r c91e6ae4c27a0ee87e90df13285826731ba0c0b2 -r 0c1a63e38a60efa3150f803fdec12e9c17ba9ae0 src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -31,6 +31,7 @@ <entry key='field-of-vision'>1</entry><entry key="wait-for-participants">true</entry><entry key="number-of-rounds">22</entry> +<entry key='round-duration'>50</entry><entry key="q1">49</entry><entry key="a1">49%</entry> @@ -67,8 +68,8 @@ <h1>Instructions</h1><hr><p> -You have already earned {showUpPayment} dollars by showing up for this exercise. You -can earn more, up to a maximum of about 45 dollars, by participating in this +You have already earned {showUpPayment} by showing up for this exercise. You +can earn more, up to a maximum of about {maximumPayment}, 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. 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. |
