Thread: [virtualcommons-svn] SF.net SVN: virtualcommons:[116] foraging/trunk/src/main

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

Revision: 116
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=116&view=rev
Author:   alllee
Date:     2009-04-21 16:59:21 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
caching view subjects + tokens radius in client data, gets initialized during
initializePosition and giving ClientData a little more intelligence about whether or
not it can view another subject.  For now logic for testing whether or not tokens
are within the field of vision will still reside in SubjectView for optimization
purposes, we don't want to recompute the Circle for every token that we want to
render, though we could pass in a Collection<Point> and return a Collection<Point>
that is filtered... 

Also tweaking the configuration a little bit for the pre-test treatment this afternoon.

Modified Paths:
--------------
    foraging/trunk/src/main/java/edu/asu/commons/foraging/client/Circle.java
    foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java
    foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java
    foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
    foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ClientData.java
    foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov-oa-chat-sanction/round0.xml

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/Circle.java
===================================================================

--- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/Circle.java	2009-04-20 20:24:46 UTC (rev 115)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/Circle.java	2009-04-21 16:59:21 UTC (rev 116)
@@ -1,6 +1,7 @@
 package edu.asu.commons.foraging.client;
 
 import java.awt.Point;
+import java.io.Serializable;
 
 /**
  * $Id$
@@ -11,9 +12,11 @@
  * @author <a href='mailto:All...@as...'>Allen Lee</a>
  * @version $Revision$
  */
-public class Circle {
-    
-    private Point center;
+public class Circle implements Serializable {
+	
+	private static final long serialVersionUID = 6400834001276229287L;
+	
+	private Point center;
     private final double radius;
     
     public Circle(Point center, double radius) {

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java	2009-04-20 20:24:46 UTC (rev 115)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java	2009-04-21 16:59:21 UTC (rev 116)
@@ -366,8 +366,12 @@
                                 // don't allow self-flagellation :-).
                                 return;
                             }
-                            event = new RealTimeSanctionRequest(dataModel.getId(), sanctionee);
-                            dataModel.sanction(dataModel.getId(), sanctionee);
+                            // only allow sanctions for subjects within this subject's field of vision
+                            Point subjectPosition = dataModel.getClientDataMap().get(sanctionee).getPoint();
+                            if (dataModel.getClientData().isSubjectInFieldOfVision(subjectPosition)) {
+                                event = new RealTimeSanctionRequest(dataModel.getId(), sanctionee);
+                                dataModel.sanction(dataModel.getId(), sanctionee);                            	
+                            }
                         }
                         else return;
                         break;

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java	2009-04-20 20:24:46 UTC (rev 115)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/client/SubjectView.java	2009-04-21 16:59:21 UTC (rev 116)
@@ -109,7 +109,7 @@
         int characterHeight = fontMetrics.getAscent();
         int verticalCharacterSpacing = (int) ( (dh - characterHeight) / 2);
         Circle fieldOfVision = null;
-        if (dataModel.getRoundConfiguration().isSubjectFieldOfVisionEnabled()) {
+        if (dataModel.getRoundConfiguration().isSubjectsFieldOfVisionEnabled()) {
             fieldOfVision = new Circle(dataModel.getCurrentPosition(), dataModel.getRoundConfiguration().getViewSubjectsRadius());
         }
         for (Map.Entry<Identifier, ClientData> entry : positions.entrySet()) {

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	2009-04-20 20:24:46 UTC (rev 115)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java	2009-04-21 16:59:21 UTC (rev 116)
@@ -104,12 +104,12 @@
         return getBooleanProperty("tokens-field-of-vision", false);
     }
     
-    public boolean isSubjectFieldOfVisionEnabled() {
+    public boolean isSubjectsFieldOfVisionEnabled() {
         return getBooleanProperty("subjects-field-of-vision", false);
     }
     
     public double getViewSubjectsRadius() {
-        if (isSubjectFieldOfVisionEnabled()) {
+        if (isSubjectsFieldOfVisionEnabled()) {
             return getDoubleProperty("view-subjects-radius", 6.0d);
         }
         throw new UnsupportedOperationException("subject field of vision is not enabled.");

Modified: foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ClientData.java
===================================================================
--- foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ClientData.java	2009-04-20 20:24:46 UTC (rev 115)
+++ foraging/trunk/src/main/java/edu/asu/commons/foraging/model/ClientData.java	2009-04-21 16:59:21 UTC (rev 116)
@@ -7,6 +7,7 @@
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
+import edu.asu.commons.foraging.client.Circle;
 import edu.asu.commons.foraging.conf.RoundConfiguration;
 import edu.asu.commons.foraging.event.RealTimeSanctionRequest;
 import edu.asu.commons.foraging.graphics.Point3D;
@@ -42,6 +43,9 @@
     private Duration freezeDuration;
     private LinkedList<RealTimeSanctionRequest> latestSanctions;
     private AnimationData animationData;
+    
+    private double viewSubjectsRadius;
+    private double viewTokensRadius;
 
     public ClientData(Identifier id) {
         this.id = id;
@@ -84,6 +88,39 @@
         }
     }
     
+
+    
+    public Circle getSubjectsFieldOfVision() {
+    	RoundConfiguration roundConfiguration = getGroupDataModel().getRoundConfiguration();
+    	if (roundConfiguration.isSubjectsFieldOfVisionEnabled()) {
+    		return new Circle(getPoint(), viewSubjectsRadius);
+    	}
+    	else {
+    		return null;
+    	}
+    }
+    
+    public boolean isSubjectInFieldOfVision(Point subjectPosition) { 
+    	Circle circle = getSubjectsFieldOfVision();
+    	if (circle == null) {
+    		// if the field of vision is null that means that there is no
+    		// field of vision enabled.
+    		return true;
+    	}
+    	return circle.contains(subjectPosition);
+    	// could also do return circle == null || circle.contains(point);
+    }
+    
+    public Circle getTokensFieldOfVision() {
+    	RoundConfiguration roundConfiguration = getGroupDataModel().getRoundConfiguration();
+    	if (roundConfiguration.isTokensFieldOfVisionEnabled()) {
+    		return new Circle(getPoint(), viewTokensRadius);
+    	}
+    	else {
+    		return null;
+    	}
+    }
+    
     public void addToken() {
         addTokens(1);
     }
@@ -151,11 +188,9 @@
    
     public synchronized void postRoundSanctionPenalty(final int tokens) {
         if (tokens < 0) {
-            System.err.println("Adding to penalties: " + tokens + " for id: " + id);
             sanctionPenalties += Math.abs(tokens);
         }
         else {
-            System.err.println("Adding to bonuses: " + tokens + " for id: " + id);
             sanctionBonuses += tokens;
         }
     }
@@ -273,7 +308,7 @@
         case 4:
             return ( topLeftCorner.add(new Point3D(worldWidth * 3, 0, worldDepth * 3)) );
         default:
-            throw new IllegalArgumentException("initializePosition is hardcoded and does not support more than 4 clients");
+            throw new IllegalArgumentException("generate3DPosition is hardcoded to only support up to 4 clients");
         }
     }
     
@@ -295,7 +330,9 @@
     public void setExplicitCollectionMode(boolean explicitCollectionMode) {
         this.explicitCollectionMode = explicitCollectionMode;
     }
+    
 
+
     /**
      * This method only makes sense within the group that this client data is embedded.
      */
@@ -308,6 +345,12 @@
     public void initializePosition() {
         RoundConfiguration roundConfiguration = getGroupDataModel().getRoundConfiguration();
         setExplicitCollectionMode(roundConfiguration.isAlwaysInExplicitCollectionMode());
+        if (roundConfiguration.isSubjectsFieldOfVisionEnabled()) {
+        	viewSubjectsRadius = roundConfiguration.getViewSubjectsRadius();
+        }
+        if (roundConfiguration.isTokensFieldOfVisionEnabled()) {
+        	viewTokensRadius = roundConfiguration.getViewTokensRadius();
+        }
         if (roundConfiguration.isRealTimeSanctioningEnabled()) {
             latestSanctions = new LinkedList<RealTimeSanctionRequest>();
         }

Modified: foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov-oa-chat-sanction/round0.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov-oa-chat-sanction/round0.xml	2009-04-20 20:24:46 UTC (rev 115)
+++ foraging/trunk/src/main/resources/configuration/asu-experiments/mobile-fov-oa-chat-sanction/round0.xml	2009-04-21 16:59:21 UTC (rev 116)
@@ -10,6 +10,7 @@
 
 <entry key='resource-generator'>mobile</entry>
 <entry key='tokens-field-of-vision'>true</entry>
+<entry key='view-tokens-radius'>3.0</entry>
 <entry key='subjects-field-of-vision'>true</entry>
 
 <entry key='regrowth-rate'>.01</entry>


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


