Changeset 22 for protocol/src

Timestamp:

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

Author:

bart

Message:

Minor fixes

Location:

protocol/src

Files:

• main/java/geniusweb/protocol/session/mopac/MOPAC.java (modified) (4 diffs)
• main/java/geniusweb/protocol/session/mopac/MOPACState.java (modified) (5 diffs)
• test/java/geniusweb/protocol/session/amop/AMOPSettingsTest.java (modified) (1 diff)
• test/java/geniusweb/protocol/session/amop/AMOPStateTest.java (modified) (3 diffs)
• test/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettingsTest.java (modified) (8 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;
         }
 

protocol/src/test/java/geniusweb/protocol/session/amop/AMOPSettingsTest.java

@@ -97 +97 @@
         }
 
+        @SuppressWarnings("unused")
         @Test(expected = IllegalArgumentException.class)
         public void constructorNoDeadlineTest() {

protocol/src/test/java/geniusweb/protocol/session/amop/AMOPStateTest.java

@@ -172 +172 @@
         }
 
+        @SuppressWarnings("unused")
         @Test
         public void constructWithNullConnection() {
@@ -375 +376 @@
         @Test
         public void testCollectVotes() {
-                Votes vote1AB = new Votes(party1,
-                                Arrays.asList(new Vote(party1, a, 2), new Vote(party1, b, 2)));
-                Votes vote2AB = new Votes(party2,
-                                Arrays.asList(new Vote(party2, a, 2), new Vote(party2, b, 2)));
-                Votes vote3C = new Votes(party3, Arrays.asList(new Vote(party3, c, 2)));
-                Votes vote4AC = new Votes(party4,
-                                Arrays.asList(new Vote(party4, a, 2), new Vote(party4, c, 2)));
+                Votes vote1AB = new Votes(party1, Arrays
+                                .asList(new Vote(party1, a, 2, 9), new Vote(party1, b, 2, 9)));
+                Votes vote2AB = new Votes(party2, Arrays
+                                .asList(new Vote(party2, a, 2, 9), new Vote(party2, b, 2, 9)));
+                Votes vote3C = new Votes(party3,
+                                Arrays.asList(new Vote(party3, c, 2, 9)));
+                Votes vote4AC = new Votes(party4, Arrays
+                                .asList(new Vote(party4, a, 2, 9), new Vote(party4, c, 2, 9)));
                 // party 1,2,4 vote for A, party 1,2 vote for B, party 3,4 vote for C.
                 // the biggest vote is P,Q,S
@@ -407 +409 @@
         public void testNextPhase() {
                 // copy of above. todo cleanup
-                Votes vote1AB = new Votes(party1,
-                                Arrays.asList(new Vote(party1, a, 2), new Vote(party1, b, 2)));
-                Votes vote2AB = new Votes(party2,
-                                Arrays.asList(new Vote(party2, a, 2), new Vote(party2, b, 2)));
-                Votes vote3C = new Votes(party3, Arrays.asList(new Vote(party3, c, 2)));
-                Votes vote4AC = new Votes(party4,
-                                Arrays.asList(new Vote(party4, a, 2), new Vote(party4, c, 2)));
+                Votes vote1AB = new Votes(party1, Arrays
+                                .asList(new Vote(party1, a, 2, 9), new Vote(party1, b, 2, 9)));
+                Votes vote2AB = new Votes(party2, Arrays
+                                .asList(new Vote(party2, a, 2, 9), new Vote(party2, b, 2, 9)));
+                Votes vote3C = new Votes(party3,
+                                Arrays.asList(new Vote(party3, c, 2, 9)));
+                Votes vote4AC = new Votes(party4, Arrays
+                                .asList(new Vote(party4, a, 2, 9), new Vote(party4, c, 2, 9)));
                 // party 1,2,4 vote for A, party 1,2 vote for B, party 3,4 vote for C.
                 // the biggest vote is P,Q,S

protocol/src/test/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettingsTest.java

@@ -68 +68 @@
                 profile2 = new ProfileRef("profile2");
                 profile3 = new ProfileRef("profile3");
-                ProfileList profiles1 = new ProfileList(Arrays.asList(profile1));
-                ProfileList profiles2 = new ProfileList(Arrays.asList(profile2));
-                ProfileList profiles3 = new ProfileList(Arrays.asList(profile3));
+                profiles1 = new ProfileList(Arrays.asList(profile1));
+                profiles2 = new ProfileList(Arrays.asList(profile2));
+                profiles3 = new ProfileList(Arrays.asList(profile3));
 
                 List<ProfileList> profiles = Arrays.asList(profiles1, profiles2,
@@ -137 +137 @@
         }
 
+        @SuppressWarnings("unused")
         @Test(expected = IllegalArgumentException.class)
         public void testNullParties() {
@@ -145 +146 @@
         }
 
+        @SuppressWarnings("unused")
         @Test(expected = IllegalArgumentException.class)
         public void testNoParties() {
@@ -153 +155 @@
         }
 
+        @SuppressWarnings("unused")
         @Test(expected = IllegalArgumentException.class)
         public void testNullProfiles() {
@@ -159 +162 @@
         }
 
+        @SuppressWarnings("unused")
         @Test(expected = IllegalArgumentException.class)
         public void testInsufficientProfiles() {
@@ -167 +171 @@
         }
 
+        @SuppressWarnings("unused")
         @Test(expected = IllegalArgumentException.class)
         public void testNullSessionSettings() {
@@ -175 +180 @@
         }
 
+        @SuppressWarnings("unused")
         @Test(expected = IllegalArgumentException.class)
         public void testOnePartyPerSession() {
@@ -189 +195 @@
         }
 
-//      @Test
-//      public void makeCobTest() throws URISyntaxException {
-//              // Check that the cob party gets profile without the query part
-//              String profilebase = "ws://1.2.3.4:8080/profilesserver-a.b.c/websocket/get/someprofile";
-//              String partybase = "http://131.180.202.213:8080/partiesserver/run/";
-//              String query = "?a=2&partial=4";
-//              PartyWithProfile partyprofile = AllPermutationsSettings.makeCob(
-//                              new PartyRef(partybase + AllPermutationsSettings.COB_PARTY),
-//                              new ProfileRef(profilebase + query));
-//              assertEquals(profilebase,
-//                              partyprofile.getProfile().getURI().toString());
-//              assertEquals(partybase + AllPermutationsSettings.COB_PARTY,
-//                              partyprofile.getParty().getPartyRef().getURI().toString());
-//      }
-
 }