Changeset 22 for protocol/src/main

Timestamp:

09/22/20 16:26:36 (4 years ago)

Author:

bart

Message:

Minor fixes

Location:

protocol/src/main/java/geniusweb/protocol/session/mopac

Files:

• MOPAC.java (modified) (4 diffs)
• MOPACState.java (modified) (5 diffs)

protocol/src/main/java/geniusweb/protocol/session/mopac/MOPAC.java

@@ -145 +145 @@
                         ProtocolToPartyConnFactory connectionfactory) {
                 try {
-                        System.out.println("starting MOPAC");
+                        //System.out.println("starting MOPAC");
                         // we're in Phase.INIT still
                         connect(connectionfactory);
@@ -314 +314 @@
                         final ProtocolToPartyConn partyconn, final Action action,
                         long now) {
-                System.out.println("received " + action);
+                //System.out.println("received " + action);
                 state = state.with(partyconn.getParty(), action, now);
                 checkEndPhase(System.currentTimeMillis());
@@ -341 +341 @@
 
                 state = state.nextPhase(now);
+
                 startPhase(now);
         }
@@ -351 +352 @@
          */
         private void broadcastNegotiators(Inform info) {
-                System.out.println("broadcasting " + info);
+                //System.out.println("broadcasting " + info);
                 for (PartyId party : state.getPhase().getPartyStates()
                                 .getNegotiatingParties()) {

protocol/src/main/java/geniusweb/protocol/session/mopac/MOPACState.java

@@ -14 +14 @@
 import geniusweb.actions.PartyId;
 import geniusweb.inform.Agreements;
+import geniusweb.inform.OptIn;
 import geniusweb.progress.Progress;
 import geniusweb.progress.ProgressRounds;
@@ -22 +23 @@
 import geniusweb.protocol.session.SessionState;
 import geniusweb.protocol.session.mopac.phase.OfferPhase;
+import geniusweb.protocol.session.mopac.phase.OptInPhase;
 import geniusweb.protocol.session.mopac.phase.Phase;
 import geniusweb.protocol.session.saop.SAOPSettings;
@@ -127 +129 @@
         /**
          * @param now current time ms since 1970
-         * @return the max possible duration in ms of this phase. Maybe negative if
-         *         ew are past deadline
+         * @return the max possible duration in ms of the NEXT phase. Maybe 0 or
+         *         negative if past deadline.
          */
         private Long getAvailablePhaseTime(long now) {
+                // explicit check, to check also the round counts.
+                if (incrementProgress().isPastDeadline(now + Phase.PHASE_MINTIME))
+                        return 0l;
                 return Math.min(progress.getTerminationTime().getTime() - now,
                                 Phase.PHASE_MAXTIME);
@@ -196 +201 @@
                 Phase newphase = phase.next(now,
                                 Math.min(remainingNegoTime, Phase.PHASE_MAXTIME));
-                Progress newprogress = progress;
-                if (newphase instanceof OfferPhase
-                                && progress instanceof ProgressRounds)
-                        newprogress = ((ProgressRounds) progress).advance();
-
-                return new MOPACState(newphase, actions, connections, newprogress,
-                                getSettings(), partyprofiles);
+
+                return new MOPACState(newphase, actions, connections,
+                                incrementProgress(), getSettings(), partyprofiles);
+        }
+
+        /**
+         * 
+         * @return the next progress. Progress round advances if phase is
+         *         {@link OptIn}.
+         */
+        private Progress incrementProgress() {
+                if (progress instanceof ProgressRounds && phase instanceof OptInPhase)
+                        return ((ProgressRounds) progress).advance();
+                return progress;
         }
 
@@ -217 +229 @@
          */
         public boolean isNewPhasePossible(long now) {
-                return phase.getPartyStates().getNegotiatingParties().size() >= 2
+                // System.out.println("phase=" + phase);
+                boolean a = phase.getPartyStates().getNegotiatingParties().size() >= 2
                                 && getAvailablePhaseTime(now) > Phase.PHASE_MINTIME;
+                // System.out.println("newstate possible:" + a);
+                return a;
         }