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

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

Revision: 112
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=112&view=rev
Author:   alllee
Date:     2009-04-20 03:37:49 +0000 (Mon, 20 Apr 2009)

Log Message:
-----------
fixing bug in getValidMooreNeighborhood that was returning points outside of
the bounds of the resource grid.

Modified Paths:
--------------
    foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceDispenser.java

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceDispenser.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceDispenser.java	2009-04-20 03:17:21 UTC (rev 111)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ResourceDispenser.java	2009-04-20 03:37:49 UTC (rev 112)
@@ -205,30 +205,19 @@
             List<Point> neighborhoodPoints = new ArrayList<Point>();
             int currentX = referencePoint.x;
             int currentY = referencePoint.y;
-            for (int x = currentX - 1; x < currentX + 2; x++) {
-                for (int y = currentY - 1; y < currentY + 2; y++) {
+            int endX = currentX + 2;
+            int endY = currentY + 2;
+            for (int x = currentX - 1; x < endX; x++) {
+                for (int y = currentY - 1; y < endY; y++) {
                     Point point = new Point(x, y);
                     // only add a point to the neighborhood set if it doesn't already have a resource.
-                    if (! existingPositions.contains(point)) {
+                    if (serverDataModel.isValidPosition(point) && ! existingPositions.contains(point)) {
                         neighborhoodPoints.add(point);    
                     }
-                    
                 }
             }
             return neighborhoodPoints;
         }
-
-        private Set<Point> getMooreNeighborhood(Point point) {
-            Set<Point> neighborhoodPoints = new HashSet<Point>();
-            int currentX = point.x;
-            int currentY = point.y;
-            for (int x = currentX - 1; x < currentX + 2; x++) {
-                for (int y = currentY - 1; y < currentY + 2; y++) {
-                    neighborhoodPoints.add(new Point(x, y));
-                }
-            }
-            return neighborhoodPoints;
-        }
     }
 
     public class TopBottomPatchGenerator extends DensityDependentResourceGenerator {


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