[virtualcommons-svn] commit/foraging: alllee: neglected to add selected rule (in the event of a tie breaker, not derivable from just the votes themselves)

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

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/e7e0fd970422/
changeset:   e7e0fd970422
branch:      asu-foraging-2012
user:        alllee
date:        2012-07-27 00:33:00
summary:     neglected to add selected rule (in the event of a tie breaker, not derivable from just the votes themselves)
affected #:  1 file

diff -r d06723a1082b35f37479ad60f212a1909546b872 -r e7e0fd9704227f80e343e36f72bb460e23b671bc 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
@@ -14,6 +14,7 @@
 import edu.asu.commons.event.PersistableEvent;
 import edu.asu.commons.experiment.SaveFileProcessor;
 import edu.asu.commons.experiment.SavedRoundData;
+import edu.asu.commons.foraging.event.RuleSelectedUpdateEvent;
 import edu.asu.commons.foraging.event.RuleVoteRequest;
 import edu.asu.commons.foraging.event.TokenCollectedEvent;
 import edu.asu.commons.foraging.model.ClientData;
@@ -77,6 +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>();
         for (PersistableEvent action: savedRoundData.getActions()) {
             if (action instanceof ChatRequest) {
                 writer.println(String.format("%s, %s, %s, %s", 
@@ -89,6 +91,9 @@
             else if (action instanceof RuleVoteRequest) {
                 ruleVoteRequests.put(action.getId(), (RuleVoteRequest) action);
             }
+            else if (action instanceof RuleSelectedUpdateEvent) {
+                ruleSelectedEvents.put(serverDataModel.getGroup(action.getId()), (RuleSelectedUpdateEvent) action);
+            }
         }
         if (! ruleVoteRequests.isEmpty()) {
             for (GroupDataModel group: groups) {
@@ -100,6 +105,7 @@
                     }
                 });
                 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.