Changeset 20 for protocol

Timestamp:

08/05/20 09:42:15 (4 years ago)

Author:

bart

Message:

Added BOA support, some bug fixes

Location:

protocol

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/geniusweb/protocol/session/SessionResult.java (added)
• src/main/java/geniusweb/protocol/session/SessionState.java (modified) (1 diff)
• src/main/java/geniusweb/protocol/session/saop/SAOPState.java (modified) (2 diffs)
• src/main/java/geniusweb/protocol/session/shaop/BareSHAOPState.java (modified) (3 diffs)
• src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsProtocol.java (modified) (2 diffs)
• src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsState.java (modified) (1 diff)
• src/test/java/geniusweb/protocol/session/DefaultSessionStateTest.java (modified) (1 diff)
• src/test/java/geniusweb/protocol/session/SessionResultTest.java (modified) (5 diffs)
• src/test/java/geniusweb/protocol/session/shaop/SHAOPStateTest.java (modified) (2 diffs)
• src/test/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsProtocolTest.java (modified) (3 diffs)
• src/test/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsStateTest.java (modified) (1 diff)

protocol/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb</groupId>
         <artifactId>protocol</artifactId>
-        <version>1.4.2</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.4.4</version> <!-- must equal ${geniusweb.version} -->
         <packaging>jar</packaging>
 
@@ -17 +17 @@
                 <passwd>${env.ARTIFACTORY_PASS}</passwd>
                 <jackson-2-version>2.9.10</jackson-2-version>
-                <geniusweb.version>1.4.2</geniusweb.version>
+                <geniusweb.version>1.4.4</geniusweb.version>
         </properties>
 

protocol/src/main/java/geniusweb/protocol/session/SessionState.java

@@ -65 +65 @@
          */
         Bid getAgreement();
+
+        /**
+         * 
+         * @return the {@link SessionResult}. Assumes {@link #isFinal(long)}. result
+         *         may be undefined if not.
+         */
+        SessionResult getResult();
 }

protocol/src/main/java/geniusweb/protocol/session/saop/SAOPState.java

@@ -19 +19 @@
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
 import geniusweb.protocol.session.DefaultSessionState;
+import geniusweb.protocol.session.SessionResult;
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.references.PartyWithProfile;
@@ -248 +249 @@
         }
 
+        @Override
+        public SessionResult getResult() {
+                List<Double> emptylist = new LinkedList<>();
+                for (int n = 0; n < getConnections().size(); n++)
+                        emptylist.add(0d);
+                return new SessionResult(getSettings().getAllParties(), getAgreement(),
+                                emptylist, getError());
+        }
+
 }

protocol/src/main/java/geniusweb/protocol/session/shaop/BareSHAOPState.java

@@ -1 +1 @@
 package geniusweb.protocol.session.shaop;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -13 +14 @@
 import geniusweb.protocol.ProtocolException;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.session.SessionResult;
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.protocol.session.SessionState;
@@ -169 +171 @@
 
         @Override
+        public SessionResult getResult() {
+                Double[] penalties = new Double[partyNumbers.size()];
+                for (PartyId party : partyNumbers.keySet()) {
+                        Double spent = totalSpent.get(party);
+                        if (spent == null) {
+                                spent = 0d;
+                        } else {
+                                spent = Math.max(0, Math.min(1.0, spent));
+                        }
+                        penalties[partyNumbers.get(party)] = spent;
+                }
+                return new SessionResult(getSettings().getAllParties(), getAgreement(),
+                                Arrays.asList(penalties), getError());
+
+        }
+
+        @Override
         public int hashCode() {
                 final int prime = 31;

protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsProtocol.java

@@ -6 +6 @@
 import geniusweb.events.TournamentStarted;
 import geniusweb.protocol.CurrentNegoState;
-import geniusweb.protocol.SessionResult;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
+import geniusweb.protocol.session.SessionResult;
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.protocol.session.SessionState;
@@ -83 +83 @@
                                 // List<TeamOfPartiesAndProfiles> participants =
                                 // sessionstate.getSettings().getParticipants()
-                                SessionResult result = new SessionResult(
-                                                sessionstate.getSettings().getAllParties(),
-                                                sessionstate.getAgreement(), sessionstate.getError());
+                                SessionResult result = sessionstate.getResult();
                                 state = state.with(result);
                                 notifyListeners(new CurrentNegoState(state));

protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsState.java

@@ -6 +6 @@
 
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.SessionResult;
+import geniusweb.protocol.session.SessionResult;
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.protocol.tournament.TournamentState;

protocol/src/test/java/geniusweb/protocol/session/DefaultSessionStateTest.java

@@ -139 +139 @@
         }
 
+        @Override
+        public SessionResult getResult() {
+
+                List<Double> emptylist = new LinkedList<>();
+                for (int n = 0; n < getConnections().size(); n++)
+                        emptylist.add(0d);
+                return new SessionResult(getSettings().getAllParties(), getAgreement(),
+                                emptylist, getError());
+
+        }
+
 }

protocol/src/test/java/geniusweb/protocol/session/SessionResultTest.java

@@ -19 +19 @@
 import geniusweb.issuevalue.DiscreteValue;
 import geniusweb.issuevalue.Value;
-import geniusweb.protocol.SessionResult;
 import geniusweb.references.Parameters;
 import geniusweb.references.PartyRef;
@@ -32 +31 @@
 
         private final String ISSUE1 = "issue1";
-        private SessionResult result1, result1a, result2, result3;// , result4;
+        private SessionResult result1, result1a, result2, result3, result4;
         private String errorstring; // created dynamically: eclipse and maven
                                                                 // generate different stacktrace.
-        private String jsonstring = "{\"participants\":[{\"party\":{\"partyref\":\"party1\",\"parameters\":{}},\"profile\":\"profile1\"},{\"party\":{\"partyref\":\"party2\",\"parameters\":{}},\"profile\":\"profile2\"}],\"agreement\":{\"issuevalues\":{\"issue1\":\"a\"}},\"error\":null}";
+        private String jsonstring = "{\"participants\":[{\"party\":{\"partyref\":\"party1\",\"parameters\":{}},\"profile\":\"profile1\"},{\"party\":{\"partyref\":\"party2\",\"parameters\":{}},\"profile\":\"profile2\"}],\"agreement\":{\"issuevalues\":{\"issue1\":\"a\"}},\"penalties\":[0.0,0.0],\"error\":null}";
+        private List<Double> nopenalties = Arrays.asList(0d, 0d);
+        private List<Double> penalties = Arrays.asList(0.1d, 0.2d);
 
         @Before
@@ -63 +64 @@
 
                 result1 = new SessionResult(Arrays.asList(partyprofile1, partyprofile2),
-                                bid1, null);
+                                bid1, nopenalties, null);
                 result1a = new SessionResult(
-                                Arrays.asList(partyprofile1, partyprofile2), bid1, null);
+                                Arrays.asList(partyprofile1, partyprofile2), bid1, nopenalties,
+                                null);
                 result2 = new SessionResult(Arrays.asList(partyprofile1, partyprofile2),
-                                bid2, null);
+                                bid2, nopenalties, null);
                 result3 = new SessionResult(Arrays.asList(partyprofile2, partyprofile1),
-                                bid2, null);
+                                bid2, nopenalties, null);
+                result4 = new SessionResult(Arrays.asList(partyprofile2, partyprofile1),
+                                bid2, penalties, null);
+
                 // IGNORE ERROR for now, it fails somewhere deep in maven suddenly.
                 // result4 = new SessionResult(Arrays.asList(partyprofile1,
@@ -78 +83 @@
         public List<List<SessionResult>> getGeneralTestData() {
                 return Arrays.asList(Arrays.asList(result1, result1a),
-                                Arrays.asList(result2), Arrays.asList(result3)
-                // ,Arrays.asList(result4)
-                );
+                                Arrays.asList(result2), Arrays.asList(result3),
+                                Arrays.asList(result4));
         }
 
@@ -86 +90 @@
         public List<String> getGeneralTestStrings() {
                 return Arrays.asList(
-                                "SessionResult.*party1.*profile1.*,.*party2.*profile2.*Bid.*issue1=\"a\".*null.",
-                                "SessionResult.*party1.*profile1.*,.*party2.*profile2.*Bid.*issue1=\"b\".*null.*",
-                                "SessionResult.*party2.*profile2.*,.*party1.*profile1.*Bid.*issue1=\"b\".*null.*"
-                // ,"SessionResult.*party1.*profile1.*,.*party2.*profile2.*Bid.*issue1=\"a\".*null.*"
+                                "SessionResult.*party1.*profile1.*,.*party2.*profile2.*Bid.*issue1=\"a\".*0\\.0.*0\\.0.*null.*",
+                                "SessionResult.*party1.*profile1.*,.*party2.*profile2.*Bid.*issue1=\"b\".*0\\.0.*0\\.0.*null.*",
+                                "SessionResult.*party2.*profile2.*,.*party1.*profile1.*Bid.*issue1=\"b\".*0\\.0.*0\\.0.*null.*",
+                                "SessionResult.*party2.*profile2.*,.*party1.*profile1.*Bid.*issue1=\"b\".*0\\.1.*0\\.2.*null.*"
 
                 );

protocol/src/test/java/geniusweb/protocol/session/shaop/SHAOPStateTest.java

@@ -31 +31 @@
 import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.session.SessionResult;
 import geniusweb.protocol.session.TeamOfPartiesAndProfiles;
 import tudelft.utilities.junit.GeneralTests;
@@ -314 +315 @@
         }
 
+        @Test
+        public void getResultTest() {
+
+                Map<PartyId, Double> spent = new HashMap<>();
+                spent.put(party1, 0.1d);
+                SHAOPState state = new SHAOPState(actions, connections4,
+                                new ProgressRounds(10, 0, null), settings, null, 0, partynrs,
+                                spent);
+                SessionResult res = state.getResult();
+
+        }
+
 }

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

@@ -23 +23 @@
 import geniusweb.protocol.CurrentNegoState;
 import geniusweb.protocol.NegoState;
-import geniusweb.protocol.SessionResult;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
+import geniusweb.protocol.session.SessionResult;
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.protocol.session.SessionState;
@@ -46 +46 @@
         private Bid agreement = mock(Bid.class);
         private final long NOW = 1000;
+        private SessionResult finalstate = mock(SessionResult.class);
 
         @Before
@@ -53 +54 @@
                 when(finalsessionstate.getSettings()).thenReturn(settings);
                 when(finalsessionstate.getAgreement()).thenReturn(agreement);
+                when(finalsessionstate.getResult()).thenReturn(finalstate);
+                when(finalstate.getAgreement()).thenReturn(agreement);
                 when(state.with(any())).thenReturn(newstate);
         }

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

@@ -13 +13 @@
 import org.junit.Test;
 
-import geniusweb.protocol.SessionResult;
+import geniusweb.protocol.session.SessionResult;
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.references.PartyWithProfile;