[virtualcommons-svn] SF.net SVN: virtualcommons:[330] irrigation/trunk/src/main/java/edu/asu/ commons/irrigation

[<al...@us...>]

Revision: 330
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=330&view=rev
Author:   alllee
Date:     2009-10-23 18:18:35 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
adding water supply capacity instructions to label

Modified Paths:
--------------
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/GroupDataModel.java

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java	2009-10-23 16:44:30 UTC (rev 329)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/client/ExperimentGameWindow.java	2009-10-23 18:18:35 UTC (rev 330)
@@ -578,9 +578,11 @@
                 addCenterComponent(getInvestTokensPanel());
                 StringBuilder builder = new StringBuilder();
                 builder.append(
-                        String.format("<h2>The current infrastructure efficiency is %d%%, with an irrigation flow capacity of %d cubic feet per second.</h2>",
+                        String.format(
+                        		"<h2>The current infrastructure efficiency is %d%%.  The irrigation capacity is %d cubic feet per second and the water supply is %d cubic feet per second.</h2>",
                                 infrastructureEfficiency,
-                                group.calculateFlowCapacity(infrastructureEfficiency)
+                                group.calculateFlowCapacity(infrastructureEfficiency),
+                                roundConfiguration.getWaterSupplyCapacity()
                         ));
                 builder.append(getServerConfiguration().getInvestmentInstructions());
                 tokenInstructionsEditorPane.setText(builder.toString());
@@ -607,11 +609,11 @@
             else {
             	instructionsBuilder.append(
             			String.format("<p>The current infrastructure efficiency is %d%% but will be degraded by %d%% during this round." +
-            					"The current irrigation capacity is %d cfps with a maximum canal capacity is %d cfps.</p><hr/>",
+            					"The current irrigation capacity is %d cfps and the available water supply is %d cfps.</p><hr/>",
             					clientDataModel.getGroupDataModel().getInfrastructureEfficiency(),
             					roundConfiguration.getInfrastructureDegradationFactor(),
             					irrigationCapacity,
-            					roundConfiguration.getMaximumCanalFlowCapacity()
+            					roundConfiguration.getWaterSupplyCapacity()
             					));
             }
             setInstructions(instructionsBuilder.toString());

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java	2009-10-23 16:44:30 UTC (rev 329)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java	2009-10-23 18:18:35 UTC (rev 330)
@@ -43,7 +43,7 @@
         return getIntProperty("infrastructure-degradation-factor", 25);
     }
 
-    public int getMaximumCanalFlowCapacity() {
+    public int getWaterSupplyCapacity() {
         return getIntProperty("max-canal-flow-capacity", 30);
     }
 

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	2009-10-23 16:44:30 UTC (rev 329)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/GroupDataModel.java	2009-10-23 18:18:35 UTC (rev 330)
@@ -156,11 +156,11 @@
     }
     
     public int getInitialFlowCapacity() {
-    	return Math.min(calculateFlowCapacity(initialInfrastructureEfficiency), getRoundConfiguration().getMaximumCanalFlowCapacity());
+    	return Math.min(calculateFlowCapacity(initialInfrastructureEfficiency), getRoundConfiguration().getWaterSupplyCapacity());
     }
     
     public int getFlowCapacity() {
-    	return Math.min(calculateFlowCapacity(infrastructureEfficiency), getRoundConfiguration().getMaximumCanalFlowCapacity());
+    	return Math.min(calculateFlowCapacity(infrastructureEfficiency), getRoundConfiguration().getWaterSupplyCapacity());
     }
     
     public void resetCurrentlyAvailableFlowCapacity() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.