[virtualcommons-svn] SF.net SVN: virtualcommons:[406] foraging/branches/deepak-branch-fall-09/ src/main/java/edu/asu/commons/foraging

[<al...@us...>]

Revision: 406
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=406&view=rev
Author:   alllee
Date:     2009-12-04 16:16:38 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
setting group data model on enforcement mechanism update event.

Modified Paths:
--------------
    foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ClientDataModel.java
    foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java
    foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java
    foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java
    foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/model/GroupDataModel.java
    foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java

Modified: foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ClientDataModel.java
===================================================================
--- foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ClientDataModel.java	2009-12-04 15:33:49 UTC (rev 405)
+++ foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ClientDataModel.java	2009-12-04 16:16:38 UTC (rev 406)
@@ -66,12 +66,6 @@
     	return groupDataModel.getActiveMonitor().getId();
     }
     
-    private List<RegulationData> submittedRegulations;
-    
-    public void setSubmittedRegulations(List<RegulationData> regulations) {
-    	this.submittedRegulations = regulations;
-    }
-    
     public boolean isSanctioningAllowed() {
     	return getClientData().isSanctioningAllowed() || isSanctioningEnabled();
     }
@@ -290,4 +284,12 @@
     public Set<Resource> getRemovedResources() {
         return groupDataModel.getRemovedResources();
     }
+
+	public void setActiveRegulation(RegulationData regulationData) {
+		groupDataModel.setActiveRegulation(regulationData);
+	}
+	
+	public RegulationData getActiveRegulation() {
+		return groupDataModel.getActiveRegulation();
+	}
 }

Modified: foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java
===================================================================
--- foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java	2009-12-04 15:33:49 UTC (rev 405)
+++ foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java	2009-12-04 16:16:38 UTC (rev 406)
@@ -30,6 +30,7 @@
 import edu.asu.commons.foraging.event.PostRoundSanctionUpdateEvent;
 import edu.asu.commons.foraging.event.RealTimeSanctionRequest;
 import edu.asu.commons.foraging.event.RegulationSubmissionUpdateEvent;
+import edu.asu.commons.foraging.event.RegulationUpdateEvent;
 import edu.asu.commons.foraging.event.ResetTokenDistributionRequest;
 import edu.asu.commons.foraging.event.RoundStartedEvent;
 import edu.asu.commons.foraging.event.ShowInstructionsRequest;
@@ -231,7 +232,8 @@
         });
         addEventProcessor(new EventTypeProcessor<EnforcementMechanismUpdateEvent>(EnforcementMechanismUpdateEvent.class) {
             public void handle(final EnforcementMechanismUpdateEvent event) {
-                gameWindow2D.displayActiveEnforcementMechanism(event.getActiveEnforcementMechanism());
+            	dataModel.setGroupDataModel(event.getGroupDataModel());
+                gameWindow2D.displayActiveEnforcementMechanism();
             }
         });
         addEventProcessor(new EventTypeProcessor<RegulationSubmissionUpdateEvent>(RegulationSubmissionUpdateEvent.class) {
@@ -240,6 +242,12 @@
                 gameWindow2D.initializeRegulationVotingPanel();
             }
         });
+        addEventProcessor(new EventTypeProcessor<RegulationUpdateEvent>(RegulationUpdateEvent.class) {
+            public void handle(final RegulationUpdateEvent event) {
+            	dataModel.setActiveRegulation(event.getRegulationData());
+            	gameWindow2D.displayActiveRegulation();
+            }
+        });
     }
 
     public boolean canPerformRealTimeSanction() {

Modified: foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java
===================================================================
--- foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java	2009-12-04 15:33:49 UTC (rev 405)
+++ foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/client/GameWindow2D.java	2009-12-04 16:16:38 UTC (rev 406)
@@ -51,8 +51,6 @@
 import edu.asu.commons.foraging.event.SubmitRegulationRequest;
 import edu.asu.commons.foraging.model.ClientData;
 import edu.asu.commons.foraging.model.Direction;
-import edu.asu.commons.foraging.model.EnforcementMechanism;
-import edu.asu.commons.foraging.model.RegulationData;
 import edu.asu.commons.net.Identifier;
 import edu.asu.commons.util.Duration;
 import edu.asu.commons.util.HtmlEditorPane;
@@ -93,8 +91,6 @@
     // FIXME: this shouldn't be public
     public static Duration duration;
 
-    private RegulationData votedRegulation;
-
     private ChatPanel chatPanel;
 
     public final static String[] roleDescription = {
@@ -771,10 +767,11 @@
         addCenterComponent(instructionsScrollPane);
     }
 
-    public void displayActiveEnforcementMechanism(final EnforcementMechanism enforcementMechanism) {    	
+    public void displayActiveEnforcementMechanism() {    	
             SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-            	instructionsBuilder.append("<hr/><h2>Active enforcement mechanism</h2><hr/><p>").append(enforcementMechanism.getDescription()).append("</p>");
+            	instructionsBuilder.append("<hr/><h2>Active regulation</h2><hr/><p>").append(dataModel.getActiveRegulation()).append("</p>");
+            	instructionsBuilder.append("<hr/><h2>Active enforcement mechanism</h2><hr/><p>").append(dataModel.getActiveEnforcementMechanism().getDescription()).append("</p>");
             	setInstructions(instructionsBuilder.toString());
                 addCenterComponent(instructionsScrollPane);
             }
@@ -786,12 +783,11 @@
     	addCenterComponent(instructionsScrollPane);
     }
 
-    public void displayVotedRegulation() {    	
-        //new code
-        //   System.out.println("*****Inside display voting regulation");
+    public void displayActiveRegulation() {    	
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                instructionsEditorPane.setText("Below regulation has been voted from the voting conducting earlier.<br><br><br><br><b>"+votedRegulation.getText()+".</b>");
+            	setInstructions(
+            			"<h3>The following regulation received the most votes:</h3><pre>" + dataModel.getActiveRegulation() + "</pre>");
                 addCenterComponent(instructionsScrollPane);
                 startRegulationDisplayTimer();
             }
@@ -841,8 +837,7 @@
     }
 
     public void initializeEnforcementVotingPanel() {
-        //new code
-        // System.out.println("*****Inside initialize enforcement()");
+    	// TODO: revisit
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 EnforcementPanel enforcementPanel = getEnforcementPanel();
@@ -857,8 +852,6 @@
     public void initializeRegulationVotingPanel() {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                //new code
-                //System.out.println("*****Inside thread initialize votingPanel()");
                 RegulationPanel regulationPanel = updateRegulationVotingPanel();
                 addCenterComponent( regulationPanel );
                 //sanctioningPanel.startTimer();

Modified: foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java
===================================================================
--- foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java	2009-12-04 15:33:49 UTC (rev 405)
+++ foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/event/EnforcementMechanismUpdateEvent.java	2009-12-04 16:16:38 UTC (rev 406)
@@ -2,7 +2,7 @@
 package edu.asu.commons.foraging.event;
 
 import edu.asu.commons.event.AbstractEvent;
-import edu.asu.commons.foraging.model.EnforcementMechanism;
+import edu.asu.commons.foraging.model.GroupDataModel;
 import edu.asu.commons.net.Identifier;
 
 
@@ -20,14 +20,16 @@
     private static final long serialVersionUID = 5373346980670885924L;
     
     // FIXME: just send the entire group data model instead?
-    private EnforcementMechanism activeEnforcementMechanism;
+    private GroupDataModel groupDataModel;
     
-	public EnforcementMechanismUpdateEvent(Identifier id, EnforcementMechanism activeEnforcementMechanism) {
-	    this.activeEnforcementMechanism = activeEnforcementMechanism;
+	public EnforcementMechanismUpdateEvent(Identifier id, GroupDataModel groupDataModel) {
+	    super(id);
+	    this.groupDataModel = groupDataModel;
 	}
 
-    public EnforcementMechanism getActiveEnforcementMechanism() {
-        return activeEnforcementMechanism;
-    }
+	public GroupDataModel getGroupDataModel() {
+		return groupDataModel;
+	}
+
 	
 }

Modified: foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/model/GroupDataModel.java
===================================================================
--- foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/model/GroupDataModel.java	2009-12-04 15:33:49 UTC (rev 405)
+++ foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/model/GroupDataModel.java	2009-12-04 16:16:38 UTC (rev 406)
@@ -142,13 +142,15 @@
     
     public RegulationData generateRegulationRankings() {
     	resetRegulationRankingCount();
-    	double[] regulationVotingTally = new double[submittedRegulations.size()];
+    	int numberOfRegulations = submittedRegulations.size();
+    	double[] regulationVotingTally = new double[numberOfRegulations];
     	Arrays.fill(regulationVotingTally, 0.0d);
     	int maxRankingIndex = 0;
     	double maxRankingValue = 0.0d;
     	for (ClientData clientData : clients.values()) {
     		int[] regulationRankings = clientData.getRegulationRankings();
-    		for (int index = 0; index < regulationRankings.length; index++) {
+    		logger.info("client: " + clientData.getId() + " ranked regulations: "+ regulationRankings);
+    		for (int index = 0; index < numberOfRegulations; index++) {
     			regulationVotingTally[index] += rankToValue(regulationRankings[index]);
     			if (regulationVotingTally[index] > maxRankingValue) {
     				maxRankingValue = regulationVotingTally[index];
@@ -157,11 +159,19 @@
     		}
     	}
     	activeRegulation = submittedRegulations.get(maxRankingIndex);
-    	logger.info("active regulation: " + activeRegulation.getText());
+    	logger.info("active regulation: " + activeRegulation.getText() + " max ranking value: " + maxRankingValue);
     	return activeRegulation;
     }
 
-    public EnforcementMechanism generateEnforcementRankings() {
+    public RegulationData getActiveRegulation() {
+		return activeRegulation;
+	}
+
+	public void setActiveRegulation(RegulationData activeRegulation) {
+		this.activeRegulation = activeRegulation;
+	}
+
+	public EnforcementMechanism generateEnforcementRankings() {
         resetEnforcementRankingCount();
         // FIXME: change to round config parameter instead?
         double[] enforcementVotingTally = new double[EnforcementMechanism.values().length];

Modified: foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java
===================================================================
--- foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java	2009-12-04 15:33:49 UTC (rev 405)
+++ foraging/branches/deepak-branch-fall-09/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java	2009-12-04 16:16:38 UTC (rev 406)
@@ -447,7 +447,6 @@
         	for (Identifier id: group.getClientIdentifiers()) {
         		transmit(new RegulationSubmissionUpdateEvent(id, group));
         	}
-            
         }
         
         private void sendRegulationRankingUpdate(GroupDataModel group) {
@@ -460,7 +459,7 @@
         private void sendEnforcementUpdate(GroupDataModel group) {
             EnforcementMechanism enforcementMechanism = group.generateEnforcementRankings();
             for (Identifier id: group.getClientIdentifiers()) {
-                transmit(new EnforcementMechanismUpdateEvent(id, enforcementMechanism));
+                transmit(new EnforcementMechanismUpdateEvent(id, group));
             }
         }
         


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