Changeset 8 for protocol/src/main/java/geniusweb

Timestamp:

09/30/19 15:37:05 (5 years ago)

Author:

bart

Message:

Added parameter support

Location:

protocol/src/main/java/geniusweb/protocol

Files:

• session/saop/SAOP.java (modified) (7 diffs)
• tournament/allpermutations/AllPermutationsSettings.java (modified) (7 diffs)

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

@@ -28 +28 @@
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.protocol.session.SessionState;
+import geniusweb.references.Parameters;
 import geniusweb.references.PartyWithProfile;
 import geniusweb.references.ProfileRef;
@@ -101 +102 @@
                         setupParties();
                         nextTurn();
-                } catch (ProtocolException | IOException | InterruptedException e) {
+                } catch (Throwable e) {
                         handleError("Failed to start up session", null, e);
                 }
@@ -155 +156 @@
                                 .getParticipants();
                 List<Reference> parties = participants.stream()
-                                .map(parti -> (parti.getParty())).collect(Collectors.toList());
+                                .map(parti -> (parti.getParty().getPartyRef()))
+                                .collect(Collectors.toList());
                 List<ConnectionWithParty> connections = null;
                 log.log(Level.INFO, "SAOP connect " + parties);
@@ -241 +243 @@
                 PartyId partyid = connection.getParty();
                 ProfileRef profile = state.getPartyProfiles().get(partyid).getProfile();
+                Parameters params = state.getPartyProfiles().get(partyid).getParty()
+                                .getParameters();
                 if (profile == null) {
                         throw new IllegalArgumentException(
@@ -246 +250 @@
                 }
                 connection.send(new Settings(connection.getParty(), profile, getRef(),
-                                state.getProgress()));
+                                state.getProgress(), params));
         }
 
@@ -276 +280 @@
                         if (!state.isFinal(System.currentTimeMillis()))
                                 nextTurn();
-                } catch (Exception e) {
+                } catch (Throwable e) {
                         handleError("failed to handle action " + action,
                                         partyconn.getParty().getName(), e);
@@ -305 +309 @@
          */
         private synchronized void handleError(final String message,
-                        final String party, final Exception e) {
+                        final String party, final Throwable e) {
                 if (e instanceof ProtocolException) {
                         setState(state.with((ProtocolException) e));

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

@@ -11 +11 @@
 import geniusweb.protocol.tournament.TournamentSettings;
 import geniusweb.references.PartyRef;
+import geniusweb.references.PartyWithParameters;
 import geniusweb.references.PartyWithProfile;
 import geniusweb.references.ProfileRef;
@@ -35 +36 @@
  */
 public class AllPermutationsSettings implements TournamentSettings {
-        private final List<PartyRef> parties;
+        private final List<PartyWithParameters> parties;
         private final List<ProfileRef> profiles;
         private final boolean reuseParties;
@@ -58 +59 @@
         @JsonCreator
         public AllPermutationsSettings(
-                        @JsonProperty("parties") List<PartyRef> parties,
+                        @JsonProperty("parties") List<PartyWithParameters> parties,
                         @JsonProperty("reuseParties") boolean reuseParties,
                         @JsonProperty("profiles") List<ProfileRef> profiles,
@@ -97 +98 @@
         public ImmutableList<SessionSettings> permutations() {
                 ImmutableList<ImmutableList<PartyWithProfile>> partylistlist;
-                ImmutableList<PartyRef> partieslist = new FixedList<PartyRef>(parties);
+                ImmutableList<PartyWithParameters> partieslist = new FixedList<PartyWithParameters>(
+                                parties);
                 ImmutableList<ProfileRef> profileslist = new FixedList<ProfileRef>(
                                 profiles);
@@ -184 +186 @@
          */
         private ImmutableList<ImmutableList<PartyWithProfile>> getParticipants(
-                        ImmutableList<PartyRef> parties, ImmutableList<ProfileRef> profiles,
-                        int n, boolean drawPartyWithPutback) {
-
-                Permutations<PartyRef> partiesPermutations;
+                        ImmutableList<PartyWithParameters> parties,
+                        ImmutableList<ProfileRef> profiles, int n,
+                        boolean drawPartyWithPutback) {
+
+                Permutations<PartyWithParameters> partiesPermutations;
                 if (drawPartyWithPutback) {
                         partiesPermutations = new PermutationsWithReturn<>(parties, n);
@@ -199 +202 @@
                 // each tuple contains sesion info: a list of partyref and a list of
                 // profileref's.
-                Tuples<ImmutableList<PartyRef>, ImmutableList<ProfileRef>> tuples = new Tuples<>(
+                Tuples<ImmutableList<PartyWithParameters>, ImmutableList<ProfileRef>> tuples = new Tuples<>(
                                 partiesPermutations, profilesPermutations);
 
-                return new MapList<Tuple<ImmutableList<PartyRef>, ImmutableList<ProfileRef>>, ImmutableList<PartyWithProfile>>(
+                return new MapList<Tuple<ImmutableList<PartyWithParameters>, ImmutableList<ProfileRef>>, ImmutableList<PartyWithProfile>>(
                                 tuple -> partyprofilelist(tuple), tuples);
         }
@@ -214 +217 @@
          */
         private ImmutableList<PartyWithProfile> partyprofilelist(
-                        Tuple<ImmutableList<PartyRef>, ImmutableList<ProfileRef>> tuple) {
-                Function2<PartyRef, ProfileRef, PartyWithProfile> //
-                makeparty = new Function2<PartyRef, ProfileRef, PartyWithProfile>() {
+                        Tuple<ImmutableList<PartyWithParameters>, ImmutableList<ProfileRef>> tuple) {
+                Function2<PartyWithParameters, ProfileRef, PartyWithProfile> //
+                makeparty = new Function2<PartyWithParameters, ProfileRef, PartyWithProfile>() {
                         @Override
-                        public PartyWithProfile apply(PartyRef party, ProfileRef profile) {
+                        public PartyWithProfile apply(PartyWithParameters party,
+                                        ProfileRef profile) {
                                 return new PartyWithProfile(party, profile);
                         }
                 };
-                return new MapThreadList<PartyWithProfile, PartyRef, ProfileRef>(
+                return new MapThreadList<PartyWithProfile, PartyWithParameters, ProfileRef>(
                                 makeparty, tuple.get1(), tuple.get2());
         }