[virtualcommons-svn] commit/foraging: alllee: neglected to store GroupDataModel with the RuleSelectedUpdateEvent.. thankfully this data should be reproducible from

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

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/273a171f8bca/
changeset:   273a171f8bca
branch:      asu-foraging-2012
user:        alllee
date:        2012-07-27 00:40:48
summary:     neglected to store GroupDataModel with the RuleSelectedUpdateEvent.. thankfully this data should be reproducible from
the logs but it needs to be added in default
affected #:  1 file

diff -r e7e0fd9704227f80e343e36f72bb460e23b671bc -r 273a171f8bcacdc1e9be0c20077d7571472584a5 src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java
--- a/src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java
+++ b/src/main/java/edu/asu/commons/foraging/data/SummaryProcessor.java
@@ -78,7 +78,7 @@
         writer.println("=========================================");
         writer.println("Time, Participant, Token Collected?, Chat");
         Map<Identifier, RuleVoteRequest> ruleVoteRequests = new HashMap<Identifier, RuleVoteRequest>();
-        Map<GroupDataModel, RuleSelectedUpdateEvent> ruleSelectedEvents = new HashMap<GroupDataModel, RuleSelectedUpdateEvent>();
+        ArrayList<RuleSelectedUpdateEvent> ruleSelectedEvents = new ArrayList<RuleSelectedUpdateEvent>();
         for (PersistableEvent action: savedRoundData.getActions()) {
             if (action instanceof ChatRequest) {
                 writer.println(String.format("%s, %s, %s, %s", 
@@ -92,10 +92,11 @@
                 ruleVoteRequests.put(action.getId(), (RuleVoteRequest) action);
             }
             else if (action instanceof RuleSelectedUpdateEvent) {
-                ruleSelectedEvents.put(serverDataModel.getGroup(action.getId()), (RuleSelectedUpdateEvent) action);
+                ruleSelectedEvents.add((RuleSelectedUpdateEvent) action);
             }
         }
         if (! ruleVoteRequests.isEmpty()) {
+            writer.println("Selected rules:\n\t" + ruleSelectedEvents);
             for (GroupDataModel group: groups) {
                 ArrayList<ClientData> clientDataList = new ArrayList<ClientData>(group.getClientDataMap().values());
                 Collections.sort(clientDataList, new Comparator<ClientData>() {
@@ -104,8 +105,8 @@
                         return Integer.valueOf(a.getAssignedNumber()).compareTo(b.getAssignedNumber());
                     }
                 });
+                
                 writer.println("=== Voting results for " + group.toString() + "===");
-                writer.println("Selected rule: " + ruleSelectedEvents.get(group).getSelectedRule());
                 for (ClientData data: clientDataList) {
                     RuleVoteRequest request = ruleVoteRequests.get(data.getId());
                     writer.println(String.format("%s, %s", data.getId(), request.getRule()));

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.