[virtualcommons-svn] SF.net SVN: virtualcommons:[333] irrigation/trunk/src/main/java/edu/asu/ commons/irrigation

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

Revision: 333
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=333&view=rev
Author:   alllee
Date:     2009-10-24 21:34:10 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
changing == to >= for token submission round notification

Modified Paths:
--------------
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/Facilitator.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java
    irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/Facilitator.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/Facilitator.java	2009-10-24 21:19:51 UTC (rev 332)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/Facilitator.java	2009-10-24 21:34:10 UTC (rev 333)
@@ -138,7 +138,7 @@
         SwingUtilities.invokeLater(createGuiRunnable);
     }
 
-    void sendBeginExperimentRequest(){
+    void sendStartRoundOverride(){
         transmit(new BeginExperimentRequest(id));
     }
 

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java	2009-10-24 21:19:51 UTC (rev 332)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/facilitator/FacilitatorWindow.java	2009-10-24 21:34:10 UTC (rev 333)
@@ -72,7 +72,7 @@
         buttonPanel.add(getBeginChatButton());
         buttonPanel.add(getDisplayInvestmentButton());
         buttonPanel.add(getStartRoundButton());
-        buttonPanel.add(getBeginExperimentButton());
+        buttonPanel.add(getStartRoundOverrideButton());
         add(buttonPanel, BorderLayout.NORTH);
         editorPane = new HtmlEditorPane();
         editorPane.setEditable(false);
@@ -116,14 +116,13 @@
         return beginChatButton;
     }
     
-    private JButton getBeginExperimentButton() {
+    private JButton getStartRoundOverrideButton() {
     	if (beginExperimentButton == null) {
-    		beginExperimentButton = new JButton("Begin experiment");
+    		beginExperimentButton = new JButton("Override");
     		beginExperimentButton.addActionListener(new ActionListener() {
     			public void actionPerformed(ActionEvent event) {
-    				facilitator.sendBeginExperimentRequest();
+    				facilitator.sendStartRoundOverride();
     			}
-    			
     		});
     	}
     	return beginExperimentButton;

Modified: irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java
===================================================================
--- irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java	2009-10-24 21:19:51 UTC (rev 332)
+++ irrigation/trunk/src/main/java/edu/asu/commons/irrigation/server/IrrigationServer.java	2009-10-24 21:34:10 UTC (rev 333)
@@ -108,6 +108,7 @@
         addEventProcessor(new EventTypeProcessor<BeginExperimentRequest>(BeginExperimentRequest.class) {
             @Override
             public void handle(BeginExperimentRequest event) {
+            	// sends override and immediately starts the round.
                 synchronized (roundSignal) {
                     roundSignal.notifyAll();
                 }
@@ -122,14 +123,9 @@
                     return;
                 }
                 // ignore the request if not every group has submit their tokens.
-                if (submittedClients == clients.size()) {
-                    synchronized (roundSignal) {
-                        roundSignal.notifyAll();
-                    }                        
-                }
-                else {
-                    System.err.println("clients still haven't submitted their tokens: " + submittedClients + " - # clients: " + clients.size());
-                }
+                synchronized (roundSignal) {
+                	roundSignal.notifyAll();
+                }                        
             }
         });
         addEventProcessor(new EventTypeProcessor<EndRoundRequest>(EndRoundRequest.class) {
@@ -234,7 +230,7 @@
                 ClientData clientData = clients.get(event.getId());
                 clientData.setInvestedTokens(event.getInvestedTokens());
                 submittedClients++;
-                if (submittedClients == clients.size()) {
+                if (submittedClients >= clients.size()) {
                     // everyone's submitted their tokens so we can calculate the available bandwidth and 
                     // notify each client
                     initializeInfrastructureEfficiency();


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