[virtualcommons-svn] commit/irrigation: alllee: updated base configurations for 2011/2012 irrigatio
Status: Beta
Brought to you by:
alllee
From: Bitbucket <com...@bi...> - 2012-02-08 22:41:31
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/5751595194cb/ changeset: 5751595194cb user: alllee date: 2012-02-08 23:41:27 summary: updated base configurations for 2011/2012 irrigation experiments affected #: 22 files diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round0.xml --- a/src/main/resources/configuration/asu/2011/pretest/round0.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round0.xml @@ -6,6 +6,7 @@ <entry key="practice-round">true</entry><entry key='reset-infrastructure-efficiency'>true</entry><entry key='initial-infrastructure-efficiency'>50</entry> +<entry key='field-of-vision'>1</entry><entry key="instructions"> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round1.xml --- a/src/main/resources/configuration/asu/2011/pretest/round1.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round1.xml @@ -3,6 +3,7 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry> +<entry key='field-of-vision'>1</entry><entry key="instructions"><![CDATA[ diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round10.xml --- a/src/main/resources/configuration/asu/2011/pretest/round10.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round10.xml @@ -2,13 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 9 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round11.xml --- a/src/main/resources/configuration/asu/2011/pretest/round11.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round11.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 10 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round12.xml --- a/src/main/resources/configuration/asu/2011/pretest/round12.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round12.xml @@ -2,14 +2,13 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - +<entry key='field-of-vision'>1</entry><entry key='initial-infrastructure-efficiency'>75</entry><entry key='reset-infrastructure-efficiency'>true</entry><entry key='infrastructure-degradation-factor'>20</entry> - <entry key="instructions"><![CDATA[ -<h3>Round 11 Instructions</h3> +<h3>Round {self.roundNumber} 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 @@ -22,7 +21,6 @@ infrastructure efficiency will be displayed and then the round will begin. If you have any questions, please ask them now. </p> - ]]></entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round13.xml --- a/src/main/resources/configuration/asu/2011/pretest/round13.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round13.xml @@ -2,16 +2,6 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - +<entry key='field-of-vision'>1</entry><entry key='infrastructure-degradation-factor'>30</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 12 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round14.xml --- a/src/main/resources/configuration/asu/2011/pretest/round14.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round14.xml @@ -2,16 +2,6 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - +<entry key='field-of-vision'>1</entry><entry key='infrastructure-degradation-factor'>25</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 13 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round15.xml --- a/src/main/resources/configuration/asu/2011/pretest/round15.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round15.xml @@ -2,15 +2,6 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> +<entry key='field-of-vision'>1</entry><entry key='infrastructure-degradation-factor'>20</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 14 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round16.xml --- a/src/main/resources/configuration/asu/2011/pretest/round16.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round16.xml @@ -3,15 +3,5 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>35</entry> - - -<entry key="instructions"> -<![CDATA[ -<h3>Round 15 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round17.xml --- a/src/main/resources/configuration/asu/2011/pretest/round17.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round17.xml @@ -3,13 +3,5 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>20</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 16 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round18.xml --- a/src/main/resources/configuration/asu/2011/pretest/round18.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round18.xml @@ -3,14 +3,5 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>15</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 17 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round19.xml --- a/src/main/resources/configuration/asu/2011/pretest/round19.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round19.xml @@ -3,15 +3,5 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>30</entry> - - -<entry key="instructions"> -<![CDATA[ -<h3>Round 18 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round2.xml --- a/src/main/resources/configuration/asu/2011/pretest/round2.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round2.xml @@ -4,17 +4,17 @@ <comment>Irrigation experiment round configuration</comment><entry key='reset-infrastructure-efficiency'>true</entry> +<entry key='field-of-vision'>1</entry><entry key="instructions"><![CDATA[ -<h3>Round 1 Instructions</h3> +<h3>Round {self.roundNumber} Instructions</h3><p> -This is the first actual round of the experiment. Before this round begins -you will have the opportunity to text chat with the other participants in your -group, then decide on your level of investment in the irrigation -infrastructure. After the total irrigation infrastructure investment has been -determined you will begin the experiment and make decisions on when to open -your irrigation gates and grow crops. +This is the first actual round of the experiment. Before this round begins you will +have the opportunity to text chat with the other participants in your group, then +decide on your level of investment in the irrigation infrastructure. After the +total irrigation infrastructure investment has been determined you will begin the +experiment and make decisions on when to open your irrigation gates and grow crops. </p> ]]></entry> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round20.xml --- a/src/main/resources/configuration/asu/2011/pretest/round20.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round20.xml @@ -2,16 +2,6 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - +<entry key='field-of-vision'>1</entry><entry key='infrastructure-degradation-factor'>30</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 19 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round21.xml --- a/src/main/resources/configuration/asu/2011/pretest/round21.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round21.xml @@ -2,15 +2,6 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - +<entry key='field-of-vision'>1</entry><entry key='infrastructure-degradation-factor'>25</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 20 Instructions</h3> -<p> -This is the final round. -</p> -]]> -</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round3.xml --- a/src/main/resources/configuration/asu/2011/pretest/round3.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round4.xml --- a/src/main/resources/configuration/asu/2011/pretest/round4.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round4.xml @@ -2,13 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 3 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round5.xml --- a/src/main/resources/configuration/asu/2011/pretest/round5.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round5.xml @@ -2,13 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 4 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round6.xml --- a/src/main/resources/configuration/asu/2011/pretest/round6.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round6.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 5 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round7.xml --- a/src/main/resources/configuration/asu/2011/pretest/round7.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round7.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 6 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round8.xml --- a/src/main/resources/configuration/asu/2011/pretest/round8.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round8.xml @@ -2,13 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 7 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 9d793c8a8b8fefa0838944ae607a2ad74ee128ae -r 5751595194cba562f21cdd240242f966b0ba25d7 src/main/resources/configuration/asu/2011/pretest/round9.xml --- a/src/main/resources/configuration/asu/2011/pretest/round9.xml +++ b/src/main/resources/configuration/asu/2011/pretest/round9.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 8 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</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. |