[virtualcommons-svn] SF.net SVN: virtualcommons:[470] irrigation/trunk/src/main/resources/ configur
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[470] irrigation/trunk/src/main/resources/ configuration/asu-fall-2009
|
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.
|
