gee-svn Mailing List for Group Experiments Environment (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 148
Author:   alllee
Date:     2006-03-05 10:16:20 -0800 (Sun, 05 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/gabel/?rev=148&view=rev

Log Message:
-----------
mindless hygiene, removing unused constructors, using Point2D's distance function instead of manually writing out the Cartesian distance formula.

Modified Paths:
--------------
    trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java
    trunk/gee/src/java/edu/indiana/psych/gee/forager/Visibility.java
    trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClientGameState.java
    trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java
Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java
===================================================================

--- trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java	2006-03-05 07:59:51 UTC (rev 147)
+++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java	2006-03-05 18:16:20 UTC (rev 148)
@@ -7,6 +7,9 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import edu.indiana.psych.gee.agent.Agent;
 import edu.indiana.psych.gee.agent.AgentFactory;
 import edu.indiana.psych.gee.agent.AgentIdentifier;
@@ -14,6 +17,8 @@
 
 class ForagerAgentFactory implements AgentFactory<ForagerExperimentParameters> {
     
+    private final static Log logger = LogFactory.getLog(ForagerAgentFactory.class);
+    
     public ForagerAgent create(ForagerExperimentParameters parameters) {
         Visibility visibility = parameters.getFoodVisibility();
         // FIXME: add support for partial visibility here.
@@ -59,16 +64,6 @@
             return new Point(x, y);
         }
         
-        private int clamp(double value, int start, int end) {
-            if (value >= end) {
-                return end - 1;
-            }
-            else if (value < start) {
-                return start;
-            }
-            return (int) Math.floor(value);
-        }
-        
         // FIXME: optimization hotspot 
         // should be able to just iterate through the food
         // positions and tell if it belongs to a quadrant through straight-up
@@ -106,7 +101,7 @@
             Point gridGoal = null;
             if (new Double(total).isNaN()) {
                 // if total is way big, pick random grid goal
-                System.out.println("VisibleFoodAgent: total was NaN");
+                logger.debug("total was NaN, picking randomly");
                 int newx = (int) Math.floor(Math.random() * grid_x);
                 int newy = (int) Math.floor(Math.random() * grid_y);
                 gridGoal = new Point(newx, newy);
@@ -135,7 +130,7 @@
             newy += (gridGoal.getY() * gridsize_y);
             
             setCurrentGoal(new Point(newx, newy));
-            // System.out.println("next goal set at: x: " + newx + " y: " + newy);
+            logger.debug("next goal set at: x: " + newx + " y: " + newy);
         }
         
         public Direction move() {
@@ -151,8 +146,9 @@
             for (Point currentPoint : pieces) {
                 // cartesian distance between the current piece of food and
                 // this agent's current location.
-                current = Math.sqrt(Math.pow(currentPoint.x - location.x, 2) + 
-                        Math.pow(currentPoint.y - location.y, 2));
+                current = location.distance(currentPoint);
+//                Math.sqrt(Math.pow(currentPoint.x - location.x, 2) + 
+//                        Math.pow(currentPoint.y - location.y, 2));
                 if (current < closest || closest == -1) {
                     closestPoint = currentPoint;
                     closest = current;
@@ -209,7 +205,7 @@
             Point gridGoal = null;
             if (new Double(total).isNaN()) {
                 // if total is way big, pick random grid goal
-                System.out.println("InvisibleFoodAgent: total was NaN");
+                logger.debug("total was NaN, picking randomly");
                 int newx = (int) Math.floor(Math.random() * grid_x);
                 int newy = (int) Math.floor(Math.random() * grid_y);
                 gridGoal = new Point(newx, newy);
@@ -237,7 +233,7 @@
             newy += (gridGoal.getY() * gridsize_y);
             
             setCurrentGoal(new Point(newx, newy));
-            // System.out.println("next goal set at: x: " + newx + " y: " + newy);
+            logger.debug("next goal set at: x: " + newx + " y: " + newy);
         }
         
 
@@ -297,7 +293,7 @@
             this.config = experimentConfiguration;
             
             // are agents visible
-            this.visibleAgents = ! experimentConfiguration.getSubjectVisibility().isZeroVisibility();
+            this.visibleAgents = ! experimentConfiguration.getSubjectVisibility().isZero();
             
             // find how out big grid we have            
             board_x = experimentConfiguration.getBoardSize().width;
@@ -337,7 +333,7 @@
             int posx = (int) Math.floor((double) location.x / (double) gridsize_x);
             int posy = (int) Math.floor((double) location.y / (double) gridsize_y);
             
-            if (event.wasFoodConsumed()) {
+            if (event.didConsumeFood()) {
                 Qgrid[posx][posy] += foodReward;
             } 
             else {

Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/Visibility.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/forager/Visibility.java	2006-03-05 07:59:51 UTC (rev 147)
+++ trunk/gee/src/java/edu/indiana/psych/gee/forager/Visibility.java	2006-03-05 18:16:20 UTC (rev 148)
@@ -57,7 +57,7 @@
      * 
      * @return
      */
-    public boolean isZeroVisibility() {
+    public boolean isZero() {
         return this == ZERO;
     }
     

Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClientGameState.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClientGameState.java	2006-03-05 07:59:51 UTC (rev 147)
+++ trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClientGameState.java	2006-03-05 18:16:20 UTC (rev 148)
@@ -73,7 +73,7 @@
             }
             clientState.setPosition(point);
         }
-        if (event.wasFoodConsumed()) {
+        if (event.didConsumeFood()) {
             ClientState clientState = clients.get(event.id());
             clientState.incrementFoodEaten();
             // FIXME: drop an event into the event channel to signal the ForagerGameWindow

Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java	2006-03-05 07:59:51 UTC (rev 147)
+++ trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java	2006-03-05 18:16:20 UTC (rev 148)
@@ -1,7 +1,6 @@
 package edu.indiana.psych.gee.forager.event;
 
 import java.awt.Point;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -15,7 +14,7 @@
  * $Id$
  *
  * Maintains a Map of all clients and their locations (denoted by
- * java.awt.Point-S).  If the foodEaten point is null, then no food was
+ * java.awt.Point-S).  If the didConsumeFood point is null, then no food was
  * consumed by the client identified by this Event's Identifier.
  *
  * Can also maintain a list of food positions, if the food is visible
@@ -29,28 +28,29 @@
     private static final long serialVersionUID = -128693557750400520L;
     private final Map<Identifier, Point> clientPositions;
     private final Set<Point> foodPositions;
-    private final boolean foodEaten;
+    private final boolean didConsumeFood;
     
 //    private int numberOfBytes;
     
-    public ClientPositionUpdateEvent(Identifier clientId, Map<Identifier, Point> positions) {
-        this(clientId, false, positions);
-    }
+//    public ClientPositionUpdateEvent(Identifier clientId, Map<Identifier, Point> positions) {
+//        this(clientId, false, positions);
+//    }
+//
+//    public ClientPositionUpdateEvent(Identifier clientId, boolean didConsumeFood, Map<Identifier, Point> positions) {
+//        // FIXME: use Collections.EMPTY_SET instead of null?
+//        this(clientId, didConsumeFood, positions, null);
+//    }
 
-    public ClientPositionUpdateEvent(Identifier clientId, boolean foodEaten, Map<Identifier, Point> positions) {
-        this(clientId, foodEaten, positions, Collections.EMPTY_SET);
-    }
-
-    public ClientPositionUpdateEvent(Identifier clientId, boolean foodEaten, Map<Identifier, Point> positions, Set<Point> foodPositions) {
+    public ClientPositionUpdateEvent(Identifier clientId, boolean didConsumeFood, Map<Identifier, Point> positions, Set<Point> foodPositions) {
         super(clientId);
-        this.foodEaten = foodEaten;
+        this.didConsumeFood = didConsumeFood;
         this.clientPositions = positions;
         this.foodPositions = foodPositions;
         //this.numberOfBytes = GeeUtils.getNumberOfBytes(this);
     }
     
-    public boolean wasFoodConsumed() {
-        return foodEaten;
+    public boolean didConsumeFood() {
+        return didConsumeFood;
     }
 
     public Map<Identifier, Point> getClientPositions() {



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






gee-svn Mailing List for Group Experiments Environment (Page 3)

gee-svn — GEE svn repository traffic