Changeset 14 for protocol/src/main

Timestamp:

04/28/20 12:56:46 (5 years ago)

Author:

bart

Message:

Release 1.4.0

Location:

protocol/src/main/java/geniusweb/protocol/tournament

Files:

• TournamentState.java (modified) (1 diff)
• allpermutations/AllPermutationsSettings.java (modified) (12 diffs)
• allpermutations/ProfileList.java (added)
• allpermutations/Team.java (added)

protocol/src/main/java/geniusweb/protocol/tournament/TournamentState.java

@@ -7 +7 @@
 
 /**
- * The current state of the tournament. Must be serializabl;e so that it can be
- * restarted if a crash occurs.
+ * The current state of the tournament. Must be implement Json serialization so
+ * that it can be used to log the state. State must contain all information to
+ * determine the relevant info of the negotiation. It may also be used to
+ * restart the nego if a crash occurs.
  */
 @JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)

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

@@ -1 +1 @@
 package geniusweb.protocol.tournament.allpermutations;
 
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.List;
@@ -9 +7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import geniusweb.profile.Profile;
 import geniusweb.protocol.session.SessionSettings;
 import geniusweb.protocol.session.TeamOfPartiesAndProfiles;
@@ -18 +15 @@
 import geniusweb.protocol.tournament.TournamentProtocol;
 import geniusweb.protocol.tournament.TournamentSettings;
-import geniusweb.references.Parameters;
-import geniusweb.references.PartyRef;
-import geniusweb.references.PartyWithParameters;
 import geniusweb.references.PartyWithProfile;
-import geniusweb.references.ProfileRef;
 import tudelft.utilities.immutablelist.FixedList;
 import tudelft.utilities.immutablelist.Function2;
@@ -68 +61 @@
 
         public static final String COB_PARTY = "comparebids-1.2.0";
-        private final List<PartyWithParameters> parties;
-        private final List<ProfileRef> profiles;
-        private final boolean reuseParties;
-        private final int partiesPerSession;
+        private final List<Team> teams;
+        private final List<ProfileList> profileslists;
+        private final boolean reuseTeams;
+        private final int teamsPerSession;
         private final SessionSettings sessionsettings;
 
         /**
          * 
-         * @param parties           a list of {@link PartyRef}s. Must contain at
-         *                          least <partiesPerSession> elements.
-         * @param reuseParties      if true, we use PermutationsWithReturn, if false
-         *                          we use PermutationsWithoutReturn to create the
-         *                          parties.
-         * @param profiles          list of available {@link Profile}s to be
-         *                          permutated over the parties
-         * @param partiesPerSession number of parties per session, must be at least
-         *                          2.
-         * @param sesettings        The generic {@link SessionSetting}.
-         *                          {@link SessionSettings#with(PartyWithProfile)}
-         *                          will be used to add the required
-         *                          {@link PartyWithProfile}s
+         * @param teams           a list of {@link Team}s. Must contain at least
+         *                        <partiesPerSession> elements. The <teamsize> must
+         *                        match the protocol: (SAOP:1, SHAOP:2)
+         * @param reuseTeams      if true, we use PermutationsWithReturn, if false
+         *                        we use PermutationsWithoutReturn to create the
+         *                        teams.
+         * @param plists          list of available {@link ProfileList}s to be
+         *                        permutated over the teams. Each
+         *                        {@link ProfileList} must contain <teamsize>
+         *                        elements.
+         * @param teamsPerSession number of parties per session, must be at least 2.
+         * @param sesettings      The generic {@link SessionSetting}.
+         *                        {@link SessionSettings#with(PartyWithProfile)}
+         *                        will be used to add the required
+         *                        {@link PartyWithProfile}s
          */
         @JsonCreator
-        public AllPermutationsSettings(
-                        @JsonProperty("parties") List<PartyWithParameters> parties,
-                        @JsonProperty("reuseParties") boolean reuseParties,
-                        @JsonProperty("profiles") List<ProfileRef> profiles,
-                        @JsonProperty("partiesPerSession") int partiesPerSession,
+        public AllPermutationsSettings(@JsonProperty("teams") List<Team> teams,
+                        @JsonProperty("profileslists") List<ProfileList> plists,
+                        @JsonProperty("reuseTeams") boolean reuseTeams,
+                        @JsonProperty("teamsPerSession") int teamsPerSession,
                         @JsonProperty("sessionsettings") SessionSettings sesettings) {
-                if (partiesPerSession < 2)
-                        throw new IllegalArgumentException("partiesPerSession must be >=2");
-                if (parties == null || parties.size() < partiesPerSession)
-                        throw new IllegalArgumentException("parties must contain at least "
-                                        + partiesPerSession + " PartyRefs");
-                if (profiles == null || profiles.size() < 2)
-                        throw new IllegalArgumentException("profiles must contain at least "
-                                        + partiesPerSession + " ProfileRefs");
-                this.partiesPerSession = partiesPerSession;
-                this.reuseParties = reuseParties;
-                this.parties = parties;
-                this.profiles = profiles;
+                if (teamsPerSession < 2)
+                        throw new IllegalArgumentException("teamsPerSession must be >=2");
+                if (teams == null || teams.size() < teamsPerSession)
+                        throw new IllegalArgumentException("teams must contain at least "
+                                        + teamsPerSession + " teams");
+                if (plists == null || plists.size() < 2)
+                        throw new IllegalArgumentException(
+                                        "profileslist must contain at least " + teamsPerSession
+                                                        + " ProfileList's");
+                int teamsize;
+                if (sesettings instanceof SAOPSettings)
+                        teamsize = 1;
+                else if (sesettings instanceof SHAOPSettings)
+                        teamsize = 2;
+                else
+                        throw new IllegalArgumentException(
+                                        "Unsupported protocol " + sesettings.getClass());
+
+                for (Team team : teams) {
+                        if (team.getParties().size() != teamsize) {
+                                throw new IllegalArgumentException("All teams should have size "
+                                                + teamsize + " but found " + team.getParties().size());
+                        }
+                }
+                for (ProfileList profile : plists) {
+                        if (profile.getProfiles().size() != teamsize) {
+                                throw new IllegalArgumentException(
+                                                "All profiles should have size equal to the team size "
+                                                                + teamsize + " but found "
+                                                                + profile.getProfiles().size());
+
+                        }
+                }
+                this.teamsPerSession = teamsPerSession;
+                this.reuseTeams = reuseTeams;
+                this.teams = teams;
+                this.profileslists = plists;
                 this.sessionsettings = sesettings;
         }
@@ -131 +150 @@
         public ImmutableList<SessionSettings> permutations() {
                 ImmutableList<ImmutableList<TeamOfPartiesAndProfiles>> partylistlist;
-                ImmutableList<PartyWithParameters> partieslist = new FixedList<PartyWithParameters>(
-                                parties);
-                ImmutableList<ProfileRef> profileslist = new FixedList<ProfileRef>(
-                                profiles);
+                ImmutableList<Team> partieslist = new FixedList<Team>(teams);
+                ImmutableList<ProfileList> profileslist = new FixedList<ProfileList>(
+                                profileslists);
                 partylistlist = getParticipants(partieslist, profileslist,
-                                partiesPerSession, reuseParties);
+                                teamsPerSession, reuseTeams);
                 return new MapList<>(partyproflist -> createSetting(partyproflist),
                                 partylistlist);
@@ -143 +161 @@
         @Override
         public String toString() {
-                return "AllPermutationsSettings[" + parties + "," + reuseParties + ","
-                                + profiles + "," + partiesPerSession + "," + sessionsettings
+                return "AllPermutationsSettings[" + teams + "," + reuseTeams + ","
+                                + profileslists + "," + teamsPerSession + "," + sessionsettings
                                 + "]";
         }
@@ -152 +170 @@
                 final int prime = 31;
                 int result = 1;
-                result = prime * result + ((parties == null) ? 0 : parties.hashCode());
-                result = prime * result + partiesPerSession;
+                result = prime * result + ((teams == null) ? 0 : teams.hashCode());
+                result = prime * result + teamsPerSession;
                 result = prime * result
-                                + ((profiles == null) ? 0 : profiles.hashCode());
-                result = prime * result + (reuseParties ? 1231 : 1237);
+                                + ((profileslists == null) ? 0 : profileslists.hashCode());
+                result = prime * result + (reuseTeams ? 1231 : 1237);
                 result = prime * result
                                 + ((sessionsettings == null) ? 0 : sessionsettings.hashCode());
@@ -171 +189 @@
                         return false;
                 AllPermutationsSettings other = (AllPermutationsSettings) obj;
-                if (parties == null) {
-                        if (other.parties != null)
+                if (teams == null) {
+                        if (other.teams != null)
                                 return false;
-                } else if (!parties.equals(other.parties))
-                        return false;
-                if (partiesPerSession != other.partiesPerSession)
-                        return false;
-                if (profiles == null) {
-                        if (other.profiles != null)
+                } else if (!teams.equals(other.teams))
+                        return false;
+                if (teamsPerSession != other.teamsPerSession)
+                        return false;
+                if (profileslists == null) {
+                        if (other.profileslists != null)
                                 return false;
-                } else if (!profiles.equals(other.profiles))
-                        return false;
-                if (reuseParties != other.reuseParties)
+                } else if (!profileslists.equals(other.profileslists))
+                        return false;
+                if (reuseTeams != other.reuseTeams)
                         return false;
                 if (sessionsettings == null) {
@@ -219 +237 @@
          */
         private ImmutableList<ImmutableList<TeamOfPartiesAndProfiles>> getParticipants(
-                        ImmutableList<PartyWithParameters> parties,
-                        ImmutableList<ProfileRef> profiles, int n,
-                        boolean drawPartyWithPutback) {
-
-                Permutations<PartyWithParameters> partiesPermutations;
+                        ImmutableList<Team> parties, ImmutableList<ProfileList> profiles,
+                        int n, boolean drawPartyWithPutback) {
+
+                Permutations<Team> partiesPermutations;
                 if (drawPartyWithPutback) {
                         partiesPermutations = new PermutationsWithReturn<>(parties, n);
@@ -230 +247 @@
                 }
 
-                Permutations<ProfileRef> profilesPermutations = new PermutationsOrderedWithoutReturn<>(
+                Permutations<ProfileList> profilesPermutations = new PermutationsOrderedWithoutReturn<>(
                                 profiles, n);
 
-                // each tuple contains sesion info: a list of partyref and a list of
-                // profileref's.
-                Tuples<ImmutableList<PartyWithParameters>, ImmutableList<ProfileRef>> tuples = new Tuples<>(
+                // each tuple contains session info: a list of Team and a list of
+                // ProfileList.
+                Tuples<ImmutableList<Team>, ImmutableList<ProfileList>> tuples = new Tuples<>(
                                 partiesPermutations, profilesPermutations);
 
-                return new MapList<Tuple<ImmutableList<PartyWithParameters>, ImmutableList<ProfileRef>>, ImmutableList<TeamOfPartiesAndProfiles>>(
+                return new MapList<Tuple<ImmutableList<Team>, ImmutableList<ProfileList>>, ImmutableList<TeamOfPartiesAndProfiles>>(
                                 tuple -> teamlist(tuple), tuples);
         }
@@ -244 +261 @@
         /**
          * 
-         * @param tuple a tuple with (1) ImmutableList<PartyRef> (2)
-         *              ImmutableList<ProfileRef>
+         * @param tuple a tuple with (1) ImmutableList<Team> (2)
+         *              ImmutableList<Profiles>
          * @return list of TeamOfPartiesAndProfiles, each picked from the two lists
          *         in order.
          */
         private ImmutableList<TeamOfPartiesAndProfiles> teamlist(
-                        Tuple<ImmutableList<PartyWithParameters>, ImmutableList<ProfileRef>> tuple) {
-                Function2<PartyWithParameters, ProfileRef, TeamOfPartiesAndProfiles> //
-                makeparty = new Function2<PartyWithParameters, ProfileRef, TeamOfPartiesAndProfiles>() {
+                        Tuple<ImmutableList<Team>, ImmutableList<ProfileList>> tuple) {
+                Function2<Team, ProfileList, TeamOfPartiesAndProfiles> makeparty = new Function2<Team, ProfileList, TeamOfPartiesAndProfiles>() {
                         @Override
-                        public TeamOfPartiesAndProfiles apply(PartyWithParameters party,
-                                        ProfileRef profile) {
+                        public TeamOfPartiesAndProfiles apply(Team team,
+                                        ProfileList profilelist) {
                                 if (sessionsettings instanceof SAOPSettings)
-                                        return new SaopPartyWithProfile(party, profile);
+                                        return new SaopPartyWithProfile(team.getParties().get(0),
+                                                        profilelist.getProfiles().get(0));
                                 else if (sessionsettings instanceof SHAOPSettings) {
-                                        return new ShaopTeam(new PartyWithProfile(party, profile),
-                                                        makeCob(party.getPartyRef(), profile));
+                                        return new ShaopTeam(
+                                                        new PartyWithProfile(team.getParties().get(0),
+                                                                        profilelist.getProfiles().get(0)),
+                                                        new PartyWithProfile(team.getParties().get(1),
+                                                                        profilelist.getProfiles().get(1)));
                                 } else
                                         throw new IllegalArgumentException(
@@ -268 +288 @@
 
                 };
-                return new MapThreadList<TeamOfPartiesAndProfiles, PartyWithParameters, ProfileRef>(
+                return new MapThreadList<TeamOfPartiesAndProfiles, Team, ProfileList>(
                                 makeparty, tuple.get1(), tuple.get2());
         }
 
-        /**
-         * Extract the raw URL, without the part after the question mark
-         * 
-         * @param party   a party reference (for another party)
-         * @param profile a profile that may have a filter like "?partial=XX"
-         * @return profile without the filter and with a cob party on the same
-         *         machine. IT IS ASSUMED that there will the default
-         *         "comparebids-1.0.0" party on the same machine as where the other
-         *         party is
-         */
-        protected static PartyWithProfile makeCob(PartyRef party,
-                        ProfileRef profile) {
-                try {
-                        URI profileuri = profile.getURI();
-                        URI partyuri = party.getURI();
-                        ProfileRef cobprof = new ProfileRef(profileuri.getScheme() + "://"
-                                        + profileuri.getAuthority() + profileuri.getPath());
-                        String partypath = partyuri.getPath();
-                        partypath = partypath.substring(0, partypath.lastIndexOf('/'));
-                        PartyWithParameters cobparty = new PartyWithParameters(new PartyRef(
-                                        partyuri.getScheme() + "://" + partyuri.getAuthority()
-                                                        + partypath + "/" + COB_PARTY),
-                                        new Parameters());
-                        return new PartyWithProfile(cobparty, cobprof);
-
-                } catch (URISyntaxException e) {
-                        throw new IllegalArgumentException(
-                                        "Failed making cob party with profile " + profile, e);
-                }
-        }
+//      /**
+//       * Extract the raw URL, without the part after the question mark
+//       * 
+//       * @param party   a party reference (for another party)
+//       * @param profile a profile that may have a filter like "?partial=XX"
+//       * @return profile without the filter and with a cob party on the same
+//       *         machine. IT IS ASSUMED that there will the default
+//       *         "comparebids-1.0.0" party on the same machine as where the other
+//       *         party is
+//       */
+//      protected static PartyWithProfile makeCob(PartyRef party,
+//                      ProfileRef profile) {
+//              try {
+//                      URI profileuri = profile.getURI();
+//                      URI partyuri = party.getURI();
+//                      ProfileRef cobprof = new ProfileRef(profileuri.getScheme() + "://"
+//                                      + profileuri.getAuthority() + profileuri.getPath());
+//                      String partypath = partyuri.getPath();
+//                      partypath = partypath.substring(0, partypath.lastIndexOf('/'));
+//                      PartyWithParameters cobparty = new PartyWithParameters(new PartyRef(
+//                                      partyuri.getScheme() + "://" + partyuri.getAuthority()
+//                                                      + partypath + "/" + COB_PARTY),
+//                                      new Parameters());
+//                      return new PartyWithProfile(cobparty, cobprof);
+//
+//              } catch (URISyntaxException e) {
+//                      throw new IllegalArgumentException(
+//                                      "Failed making cob party with profile " + profile, e);
+//              }
+//      }
 
 }