[virtualcommons-svn] commit/foraging: alllee: upwards fix from asu-foraging-2012, grabbing radius after restricted visibility check

[Bitbucket <com...@bi...>]

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/2b64a1d5d8c9/
changeset:   2b64a1d5d8c9
user:        alllee
date:        2012-02-27 07:21:49
summary:     upwards fix from asu-foraging-2012, grabbing radius after restricted visibility check
affected #:  1 file

diff -r b6b1f49dc6a167667e39b81d297e5c5163658b86 -r 2b64a1d5d8c92345ebcbda0726da02d0173cbbbc src/main/java/edu/asu/commons/foraging/data/AllDataProcessor.java
--- a/src/main/java/edu/asu/commons/foraging/data/AllDataProcessor.java
+++ b/src/main/java/edu/asu/commons/foraging/data/AllDataProcessor.java
@@ -55,7 +55,6 @@
         Map<Identifier, ClientMovementTokenCount> clientMovementTokenCounts = ClientMovementTokenCount.createMap(dataModel);
         Map<Identifier, ClientData> clientDataMap = dataModel.getClientDataMap();
         boolean restrictedVisibility = roundConfiguration.isSubjectsFieldOfVisionEnabled();
-        int radius = roundConfiguration.getViewSubjectsRadius();
         dataModel.reinitialize();
         for (PersistableEvent event: actions) {
             if (event instanceof MovementEvent) {
@@ -103,21 +102,22 @@
                 StringBuilder targetStringBuilder = new StringBuilder();
                 String message = request.toString();
                 if (restrictedVisibility) {
-                	ClientData clientData = clientDataMap.get(event.getId());
-                	GroupDataModel group = clientData.getGroupDataModel();
-                	Circle circle = new Circle(clientData.getPoint(), radius);
-            		targetStringBuilder.append('[');
-                	for (Map.Entry<Identifier, Point> entry: group.getClientPositions().entrySet()) {
-                		Identifier id = entry.getKey();
-                		Point position = entry.getValue();
-                		if (circle.contains(position)) {
-                			targetStringBuilder.append(id).append(',');
-                		}
-                	}
-                	targetStringBuilder.setCharAt(targetStringBuilder.length() - 1, ']');
+                    int radius = roundConfiguration.getViewSubjectsRadius();
+                    ClientData clientData = clientDataMap.get(event.getId());
+                    GroupDataModel group = clientData.getGroupDataModel();
+                    Circle circle = new Circle(clientData.getPoint(), radius);
+                    targetStringBuilder.append('[');
+                    for (Map.Entry<Identifier, Point> entry: group.getClientPositions().entrySet()) {
+                        Identifier id = entry.getKey();
+                        Point position = entry.getValue();
+                        if (circle.contains(position)) {
+                            targetStringBuilder.append(id).append(',');
+                        }
+                    }
+                    targetStringBuilder.setCharAt(targetStringBuilder.length() - 1, ']');
                 }
                 else {
-                	targetStringBuilder.append(request.getTarget());
+                    targetStringBuilder.append(request.getTarget());
                 }
                 String line = String.format("%s, %s, %s, %s", savedRoundData.toSecondString(event), sourceId, targetStringBuilder.toString(), message);
                 System.err.println(line);

Repository URL: https://bitbucket.org/virtualcommons/foraging/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.