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

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

Revision: 475
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=475&view=rev
Author:   alllee
Date:     2010-02-24 00:39:44 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
using ImageIO.read instead of Toolkit.getImage which seems to have improved the
image loading bug.

updating resource generation to allow for an initial number of tokens parameter.

Modified Paths:
--------------
    foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java
    foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
    foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java	2010-02-18 05:29:50 UTC (rev 474)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GridView.java	2010-02-24 00:39:44 UTC (rev 475)
@@ -7,10 +7,11 @@
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Point;
-import java.awt.Toolkit;
 import java.awt.image.ImageObserver;
+import java.io.IOException;
 import java.util.Collection;
 
+import javax.imageio.ImageIO;
 import javax.swing.JPanel;
 
 import edu.asu.commons.foraging.conf.RoundConfiguration;
@@ -150,7 +151,13 @@
     }
     
     private Image loadImage(String path) {
-        return Toolkit.getDefaultToolkit().getImage(ResourceLoader.getResourceAsUrl(path));
+        try {
+            return ImageIO.read(ResourceLoader.getResourceAsUrl(path));
+        }
+        catch (IOException exception) {
+            return null;
+        }
+//        return Toolkit.getDefaultToolkit().getImage(ResourceLoader.getResourceAsUrl(path));
     }
 
     protected void paintComponent(Graphics graphics) {

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java	2010-02-18 05:29:50 UTC (rev 474)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java	2010-02-24 00:39:44 UTC (rev 475)
@@ -22,7 +22,7 @@
     
     private static final double DEFAULT_DOLLARS_PER_TOKEN = .02d;
 
-    private static final double DEFAULT_TOKEN_MOVEMENT_PROBABILITY = 0.02d;
+    private static final double DEFAULT_TOKEN_MOVEMENT_PROBABILITY = 0.2d;
     
     private static final double DEFAULT_TOKEN_BIRTH_PROBABILITY = 0.01d;
 
@@ -132,6 +132,11 @@
     public double getRegrowthRate() {
         return getDoubleProperty("regrowth-rate", DEFAULT_REGROWTH_RATE);
     }
+    
+    public int getInitialNumberOfTokens() {
+        return getIntProperty("starting-tokens", 
+                (int) (getInitialDistribution() * getResourceWidth() * getResourceDepth()));
+    }
 
     public double getInitialDistribution() {
         return getDoubleProperty("initial-distribution", 0.5d);

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java	2010-02-18 05:29:50 UTC (rev 474)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceGenerator.java	2010-02-24 00:39:44 UTC (rev 475)
@@ -26,8 +26,8 @@
             RoundConfiguration configuration = group.getRoundConfiguration();
             int width = configuration.getResourceWidth();
             int height = configuration.getResourceDepth();
-            double initialDistribution = configuration.getInitialDistribution();
-            int tokensNeeded = (int) (width * height * initialDistribution);
+            int tokensNeeded = configuration.getInitialNumberOfTokens();
+            // FIXME: should this logic be parameterized as well 
             boolean ageMatters = ! configuration.is2dExperiment();
             int maximumResourceAge = configuration.getMaximumResourceAge();
             boolean shouldVaryAge = maximumResourceAge > 0;


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