Changeset 20 for protocol/src/main/java

Timestamp:

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

Author:

bart

Message:

Added BOA support, some bug fixes

Location:

protocol/src/main/java/geniusweb/protocol

Files:

• session/SessionResult.java (added)
• session/SessionState.java (modified) (1 diff)
• session/saop/SAOPState.java (modified) (2 diffs)
• session/shaop/BareSHAOPState.java (modified) (3 diffs)
• tournament/allpermutations/AllPermutationsProtocol.java (modified) (2 diffs)
• tournament/allpermutations/AllPermutationsState.java (modified) (1 diff)

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;