virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 2)

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

1 new commit in foraging:

https://bitbucket.org/virtualcommons/foraging/commits/1fa58fd4e98c/
Changeset:   1fa58fd4e98c
User:        alllee
Date:        2014-04-08 22:30:51
Summary:     merging stable back into default and adding ResourceOverTimeProcessor to report simple resource distribution / size
Affected #:  3 files

diff -r 4aeac01665735e7d2c07775fb9139394218a2394 -r 1fa58fd4e98ca404d4f53f1183fb733d9bbd7e53 build.xml

--- a/build.xml
+++ b/build.xml
@@ -5,7 +5,7 @@
  --><project xmlns:ivy="antlib:org.apache.ivy.ant" name="foraging" default="build-all" basedir="."><!-- ensure ivy availability -->
-  <property name="ivy.install.version" value="2.2.0"/>
+  <property name="ivy.install.version" value="2.3.0"/><condition property="ivy.home" value="${env.IVY_HOME}"><isset property="env.IVY_HOME"/></condition>

diff -r 4aeac01665735e7d2c07775fb9139394218a2394 -r 1fa58fd4e98ca404d4f53f1183fb733d9bbd7e53 src/main/java/edu/asu/commons/foraging/data/ForagingSaveFileConverter.java
--- a/src/main/java/edu/asu/commons/foraging/data/ForagingSaveFileConverter.java
+++ b/src/main/java/edu/asu/commons/foraging/data/ForagingSaveFileConverter.java
@@ -25,7 +25,8 @@
         if (allSaveFilesDirectory.exists() && allSaveFilesDirectory.isDirectory()) {
             List<SaveFileProcessor> processors = new ArrayList<SaveFileProcessor>();
             processors.addAll(Arrays.asList(
-                    new AllDataProcessor(), 
+                    new AllDataProcessor(),
+                    new ResourceOverTimeProcessor(),
                     new AggregateTimeIntervalProcessor(), 
                     new SummaryProcessor(),
                     new AggregateTokenSpatialDistributionProcessor(),

diff -r 4aeac01665735e7d2c07775fb9139394218a2394 -r 1fa58fd4e98ca404d4f53f1183fb733d9bbd7e53 src/main/java/edu/asu/commons/foraging/data/ResourceOverTimeProcessor.java
--- /dev/null
+++ b/src/main/java/edu/asu/commons/foraging/data/ResourceOverTimeProcessor.java
@@ -0,0 +1,85 @@
+package edu.asu.commons.foraging.data;
+
+import java.io.PrintWriter;
+import java.util.List;
+
+import edu.asu.commons.event.PersistableEvent;
+import edu.asu.commons.experiment.SaveFileProcessor;
+import edu.asu.commons.experiment.SavedRoundData;
+import edu.asu.commons.foraging.event.ClientPoseUpdate;
+import edu.asu.commons.foraging.event.MovementEvent;
+import edu.asu.commons.foraging.event.ResourceAddedEvent;
+import edu.asu.commons.foraging.event.ResourcesAddedEvent;
+import edu.asu.commons.foraging.event.TokenCollectedEvent;
+import edu.asu.commons.foraging.model.ClientData;
+import edu.asu.commons.foraging.model.GroupDataModel;
+import edu.asu.commons.foraging.model.ServerDataModel;
+import edu.asu.commons.util.Utils;
+
+/**
+ * $Id$
+ * 
+ * Generates a simple resource over time data file.
+ * 
+ * @author <a href='mailto:all...@as...'>Allen Lee</a>
+ * @version $Rev: 526 $
+ */
+public class ResourceOverTimeProcessor extends SaveFileProcessor.Base {
+    public ResourceOverTimeProcessor() {
+        setSecondsPerInterval(1);
+    }
+
+    public void process(SavedRoundData savedRoundData, PrintWriter writer) {
+        // populate ordered identifiers, first try directly from the participant tokens map that
+        // is persisted in later versions of the experiment.
+        ServerDataModel serverDataModel = (ServerDataModel) savedRoundData.getDataModel();
+        for (ClientData clientData : serverDataModel.getClientDataMap().values()) {
+            clientData.initializePosition();
+        }
+        List<GroupDataModel> groups = serverDataModel.getOrderedGroups();
+        writer.println("Group, Time, Resource Size");
+        for (PersistableEvent event : savedRoundData.getActions()) {
+            long secondsElapsed = savedRoundData.getElapsedTimeInSeconds(event);
+            // see if the current persistable event is past the threshold,
+            // meaning we should take a snapshot of our currently
+            // accumulated stats
+            if (isIntervalElapsed(secondsElapsed)) {
+                // generate group expected token counts
+                for (GroupDataModel group : groups) {
+                    writer.println(Utils.join(',', group.toString(), secondsElapsed, group.getResourceDistributionSize()));
+                }
+            }
+            // next, process the current persistable event
+            if (event instanceof MovementEvent) {
+                MovementEvent movementEvent = (MovementEvent) event;
+                serverDataModel.moveClient(movementEvent.getId(), movementEvent.getDirection());
+            }
+            else if (event instanceof ClientPoseUpdate) {
+                ClientPoseUpdate clientPoseUpdate = (ClientPoseUpdate) event;
+                serverDataModel.getClientDataMap().get(event.getId()).setPosition(clientPoseUpdate.getPosition());
+            }
+            else if (event instanceof TokenCollectedEvent) {
+                TokenCollectedEvent tokenCollectedEvent = (TokenCollectedEvent) event;
+                GroupDataModel group = serverDataModel.getGroup(tokenCollectedEvent.getId());
+                assert serverDataModel.getGroups().contains(group);
+                group.removeResource(tokenCollectedEvent.getLocation());
+            }
+            else if (event instanceof ResourceAddedEvent) {
+                ResourceAddedEvent resourceAddedEvent = (ResourceAddedEvent) event;
+                assert serverDataModel.getGroups().contains(resourceAddedEvent.getGroup());
+                resourceAddedEvent.getGroup().addResource(resourceAddedEvent.getPosition());
+            }
+            else if (event instanceof ResourcesAddedEvent) {
+                ResourcesAddedEvent resourcesAddedEvent = (ResourcesAddedEvent) event;
+                assert serverDataModel.getGroups().contains(resourcesAddedEvent.getGroup());
+                resourcesAddedEvent.getGroup().addResources(resourcesAddedEvent.getResources());
+            }
+        }
+    }
+
+    @Override
+    public String getOutputFileExtension() {
+        return "-resource-over-time.txt";
+    }
+
+}

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.




2008	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (21)	Aug (31)	Sep (6)	Oct (15)	Nov (2)	Dec (9)
2009	Jan (4)	Feb (6)	Mar (12)	Apr (52)	May (14)	Jun (19)	Jul (81)	Aug (115)	Sep (36)	Oct (88)	Nov (46)	Dec (58)
2010	Jan (52)	Feb (55)	Mar (48)	Apr (15)	May (5)	Jun (38)	Jul (27)	Aug (24)	Sep (28)	Oct (1)	Nov (2)	Dec (29)
2011	Jan (87)	Feb (39)	Mar (63)	Apr (42)	May (26)	Jun (53)	Jul (23)	Aug (43)	Sep (37)	Oct (25)	Nov (4)	Dec (7)
2012	Jan (73)	Feb (79)	Mar (62)	Apr (28)	May (12)	Jun (2)	Jul (9)	Aug (1)	Sep (8)	Oct	Nov (3)	Dec (3)
2013	Jan (8)	Feb (16)	Mar (38)	Apr (74)	May (62)	Jun (15)	Jul (49)	Aug (19)	Sep (9)	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr (2)	May (25)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 2)

virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic