Changeset 25 for exampleparties/randomparty

Timestamp:

10/08/20 10:17:25 (4 years ago)

Author:

bart

Message:

MOPAC support for timedependentparty, boulware, conceder, hardliner, linear

Location:

exampleparties/randomparty

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java (modified) (5 diffs)
• src/test/java/geniusweb/exampleparties/randomparty/RandomPartyTest.java (modified) (7 diffs)

exampleparties/randomparty/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb.exampleparties</groupId>
         <artifactId>randomparty</artifactId>
-        <version>1.5.3</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.5.4</version> <!-- must equal ${geniusweb.version} -->
         <packaging>jar</packaging>
 
@@ -17 +17 @@
                 <passwd>${env.ARTIFACTORY_PASS}</passwd>
                 <jackson-2-version>2.9.6</jackson-2-version>
-                <geniusweb.version>1.5.3</geniusweb.version>
+                <geniusweb.version>1.5.4</geniusweb.version>
         </properties>
 

exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java

@@ -63 +63 @@
         private Settings settings;
         private Votes lastvotes;
+        private String protocol;
 
         public RandomParty() {
@@ -81 +82 @@
                                 this.progress = settings.getProgress();
                                 this.settings = settings;
+                                this.protocol = settings.getProtocol().getURI().getPath();
+
                         } else if (info instanceof ActionDone) {
                                 Action otheract = ((ActionDone) info).getAction();
@@ -88 +91 @@
                         } else if (info instanceof YourTurn) {
                                 makeOffer();
-                                nextRound();
                         } else if (info instanceof Finished) {
                                 getReporter().log(Level.INFO, "Final ourcome:" + info);
@@ -94 +96 @@
                                 lastvotes = vote((Voting) info);
                                 getConnection().send(lastvotes);
-                                nextRound();
                         } else if (info instanceof OptIn) {
                                 // just repeat our last vote.
                                 getConnection().send(lastvotes);
-                                nextRound();
                         }
                 } catch (Exception e) {
                         throw new RuntimeException("Failed to handle info", e);
                 }
-        }
-
-        private void nextRound() {
-                if (progress instanceof ProgressRounds) {
-                        progress = ((ProgressRounds) progress).advance();
-                }
-
+                updateRound(info);
         }
 
@@ -125 +119 @@
 
         /**
+         * Update {@link #progress}
+         * 
+         * @param info the received info. Used to determine if this is the last info
+         *             of the round
+         */
+        private void updateRound(Inform info) {
+                if (protocol == null)
+                        return;
+                switch (protocol) {
+                case "SAOP":
+                case "SHAOP":
+                        if (!(info instanceof YourTurn))
+                                return;
+                        break;
+                case "MOPAC":
+                        if (!(info instanceof OptIn))
+                                return;
+                        break;
+                default:
+                        return;
+                }
+                // if we get here, round must be increased.
+                if (progress instanceof ProgressRounds) {
+                        progress = ((ProgressRounds) progress).advance();
+                }
+
+        }
+
+        /**
          * send our next offer
          */
         private void makeOffer() throws IOException {
                 Action action;
-                String protocol = settings.getProtocol().getURI().getPath();
                 if ((protocol.equals("SAOP") || protocol.equals("SHAOP"))
                                 && isGood(lastReceivedBid)) {

exampleparties/randomparty/src/test/java/geniusweb/exampleparties/randomparty/RandomPartyTest.java

@@ -7 +7 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -42 +43 @@
 import geniusweb.inform.Finished;
 import geniusweb.inform.Inform;
+import geniusweb.inform.OptIn;
 import geniusweb.inform.Settings;
 import geniusweb.inform.Voting;
@@ -68 +70 @@
         private final TestConnection connection = new TestConnection();
         private final ProtocolRef protocol = new ProtocolRef(SAOP);
+        private final ProtocolRef mopacProtocol = new ProtocolRef("MOPAC");
         private final ProgressRounds progress = mock(ProgressRounds.class);
-        private Settings settings;
+        private Settings settings, mopacSettings;
         private LinearAdditive profile;
         private final Parameters parameters = new Parameters();
@@ -80 +83 @@
                                 new ProfileRef(new URI("file:" + PROFILE)), protocol, progress,
                                 parameters);
+                mopacSettings = new Settings(PARTY1,
+                                new ProfileRef(new URI("file:" + PROFILE)), mopacProtocol,
+                                progress, parameters);
 
                 String serialized = new String(Files.readAllBytes(Paths.get(PROFILE)),
@@ -174 +180 @@
 
         @Test
-        public void testAgentsUpdatesProgress() {
+        public void testAgentsUpdatesSAOPProgress() {
                 party.connect(connection);
                 party.notifyChange(settings);
@@ -180 +186 @@
                 party.notifyChange(new YourTurn());
                 verify(progress).advance();
+        }
+
+        @Test
+        public void testAgentsUpdatesMOPACProgress() {
+                party.connect(connection);
+                party.notifyChange(mopacSettings);
+                // in mopac, progress happens only after optin phase
+                party.notifyChange(new YourTurn());
+                verify(progress, times(0)).advance();
+                party.notifyChange(
+                                new Voting(Collections.emptyList(), Collections.emptyMap()));
+                verify(progress, times(0)).advance();
+                party.notifyChange(new OptIn(Collections.emptyList()));
+                verify(progress, times(1)).advance();
         }
 
@@ -199 +219 @@
 
         @Test
-        public void testVoting() {
-                party.connect(connection);
-                party.notifyChange(settings);
+        public void testVoting() throws URISyntaxException {
+                party.connect(connection);
+                party.notifyChange(mopacSettings);
 
                 Bid bid = findGoodBid();