Changeset 11 for protocol

Timestamp:

01/30/20 16:52:38 (5 years ago)

Author:

bart

Message:

Tournament overview table, few bug fixes

Location:

protocol

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/geniusweb/protocol/session/SessionState.java (modified) (2 diffs)
• src/main/java/geniusweb/protocol/session/shaop/BareSHAOPState.java (modified) (6 diffs)
• src/main/java/geniusweb/protocol/session/shaop/SHAOP.java (modified) (2 diffs)
• src/main/java/geniusweb/protocol/session/shaop/SHAOPSettings.java (modified) (2 diffs)
• src/main/java/geniusweb/protocol/session/shaop/SHAOPState.java (modified) (10 diffs)
• src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettings.java (modified) (2 diffs)
• src/test/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettingsTest.java (modified) (1 diff)

protocol/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb</groupId>
         <artifactId>protocol</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <packaging>jar</packaging>
 
@@ -31 +31 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>profile</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
                 <dependency>
                         <groupId>geniusweb</groupId>
                         <artifactId>party</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
                 <dependency>
                         <groupId>geniusweb</groupId>
                         <artifactId>references</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
                 <dependency>
                         <groupId>geniusweb</groupId>
                         <artifactId>events</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
                 <dependency>

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

@@ -10 +10 @@
 import geniusweb.protocol.NegoState;
 import geniusweb.protocol.session.saop.SAOPState;
+import geniusweb.protocol.session.shaop.SHAOPState;
 
 /**
@@ -33 +34 @@
  * the protocol. As uaual, mark non-serializable fields as transient.
  */
-@JsonSubTypes({ @JsonSubTypes.Type(value = SAOPState.class) })
+@JsonSubTypes({ @JsonSubTypes.Type(value = SAOPState.class),
+                @JsonSubTypes.Type(value = SHAOPState.class) })
 
 public interface SessionState extends NegoState {

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

@@ -32 +32 @@
         protected final ProtocolException error;
 
-        protected final int actorNr;
+        protected final int teamNr;
 
         protected final Map<PartyId, Integer> partyNumbers;
@@ -43 +43 @@
          *                   list
          * @param conns      the currently existing connections. Can be empty/null.
-         *                   Each connection represents another party. Normally
-         *                   there is exactly 1 connection for every party. The
-         *                   protocol should check this.
+         *                   Each connection represents another party. Normally the
+         *                   connections are in the order SHAOP1,COB1,SHAOP2,COB2,..
+         *                   so 2 parties for each team. The protocol should check
+         *                   this.
          * @param progr      the {@link Progress} that governs this session. Can be
          *                   null if session did not yet start.
@@ -54 +55 @@
          *                   are bugs (not ProtocolExceptions) and should result in
          *                   a throw.
-         * @param actorNr    the actor that has the turn, index {@link #connections}
+         * @param teamNr     the teamnr (0,1,2..) that has the turn. 2* gives index
+         *                   {@link #connections} and settings
          * @param partyNrs   a map for each known PartyId to a number. The number is
          *                   the index in both {@link SHAOPSettings#getTeams()} and
@@ -64 +66 @@
         public BareSHAOPState(List<Action> actions,
                         ProtocolToPartyConnections conns, Progress progr,
-                        SHAOPSettings settings, ProtocolException e, int actorNr,
+                        SHAOPSettings settings, ProtocolException e, int teamNr,
                         Map<PartyId, Integer> partyNrs, Map<PartyId, Double> spent) {
                 if (conns == null) {
@@ -97 +99 @@
                 this.settings = settings;
                 this.error = e;
-                this.actorNr = actorNr;
+                this.teamNr = teamNr;
         }
 
@@ -106 +108 @@
         /**
          * 
-         * @return party ID of current actorNr
+         * @return party ID of current team leader (SHAOP party)
          */
-        public PartyId getCurrentActor() {
-                return connections.get(actorNr).getParty();
+        public PartyId getCurrentTeam() {
+                return connections.get(2 * teamNr).getParty();
         }
 

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

@@ -313 +313 @@
                                         .send(new ActionDone(action));
                 } else {
-                        if (!partyconn.getParty().equals(state.getCurrentActor()))
+                        if (!partyconn.getParty().equals(state.getCurrentTeam()))
                                 throw new ProtocolException(
                                                 "Party acts without having the turn",
@@ -331 +331 @@
          */
         private synchronized void nextTurn() {
-                PartyId party = state.getCurrentActor();
+                PartyId party = state.getCurrentTeam();
                 try {
                         state.getConnections().get(party).send(new YourTurn());

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

@@ -62 +62 @@
 
         /**
-         * 
-         * @param n an index number into the {@link #getTeams()} list.
-         * @return true iff that participant is a SHAOP party.
-         */
-        public boolean isShaopParty(int n) {
-                return (n & 1) == 0;
-        }
-
-        /**
          * @return the deadline for this negotiation
          */
@@ -83 +74 @@
          *         party.
          */
+        @Override
         public List<PartyWithProfile> getAllParties() {
                 return participants.stream().map(team -> team.getAllParties())

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

@@ -41 +41 @@
                         @JsonProperty("settings") SHAOPSettings settings,
                         @JsonProperty("error") ProtocolException e,
-                        @JsonProperty("actorNr") int actorNr,
+                        @JsonProperty("teamNr") int teamNr,
                         @JsonProperty("partyNumbers") Map<PartyId, Integer> partytNumbers,
                         @JsonProperty("totalSpent") Map<PartyId, Double> spent) {
-                super(actions, conns, progress, settings, e, actorNr, partytNumbers,
+                super(actions, conns, progress, settings, e, teamNr, partytNumbers,
                                 spent);
         }
@@ -73 +73 @@
          */
         public boolean isShaopParty(PartyId party) {
-                return settings.isShaopParty(partyNumbers.get(party));
+                return (partyNumbers.get(party) & 1) == 0;
         }
 
@@ -79 +79 @@
          * 
          * @param party a Party Id
-         * @return the PartyId of the party
+         * @return the PartyId of the party (COB and SHAOP are partners)
          */
         public PartyId getPartner(PartyId party) {
@@ -132 +132 @@
                 newNumbers.put(connection.getParty(), connections.size());
                 return new SHAOPState(actions, newconns, progress, settings, null,
-                                actorNr, newNumbers, totalSpent);
+                                teamNr, newNumbers, totalSpent);
         }
 
@@ -144 +144 @@
         public SHAOPState with(ProtocolException e) {
                 return new SHAOPState(actions, connections, progress, settings, e,
-                                actorNr, partyNumbers, totalSpent);
+                                teamNr, partyNumbers, totalSpent);
         }
 
@@ -162 +162 @@
                 }
                 return new SHAOPState(actions, connections, newprogress, settings,
-                                error, actorNr, partyNumbers, totalSpent);
+                                error, teamNr, partyNumbers, totalSpent);
         }
 
@@ -259 +259 @@
                 List<Action> newactions = new LinkedList<>(getActions());
                 newactions.add(action);
-                int newActor = actorNr;
+                int newTeam = teamNr;
                 if (action instanceof ElicitComparison) {
                         Object cost = getPartyProfile(partyid).getParty().getParameters()
@@ -276 +276 @@
                 } else {
                         // shaop party does real action, move to next SHAOP party.
-                        newActor = (actorNr + 2) % settings.getTeams().size();
+                        newTeam = (teamNr + 1) % settings.getTeams().size();
                         if (newprogress instanceof ProgressRounds) {
                                 newprogress = ((ProgressRounds) newprogress).advance();
@@ -282 +282 @@
                 }
                 return new SHAOPState(newactions, connections, newprogress, settings,
-                                null, newActor, partyNumbers, newSpent);
+                                null, newTeam, partyNumbers, newSpent);
 
         }
@@ -298 +298 @@
                 if (!isShaopParty(actor))
                         throw new IllegalArgumentException(
-                                        "Illegal action for COB party" + action);
+                                        "Only SHAOP party can execute " + action);
                 // real action only allowed if party has the turn.
-                if (!actor.equals(connections.get(actorNr).getParty())) {
+                if (!actor.equals(connections.get(2 * teamNr).getParty())) {
                         throw new IllegalArgumentException("Party does not have the turn ");
                 }

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

@@ -67 +67 @@
 public class AllPermutationsSettings implements TournamentSettings {
 
+        public static final String COB_PARTY = "comparebids-1.2.0";
         private final List<PartyWithParameters> parties;
         private final List<ProfileRef> profiles;
@@ -292 +293 @@
                         PartyWithParameters cobparty = new PartyWithParameters(new PartyRef(
                                         partyuri.getScheme() + "://" + partyuri.getAuthority()
-                                                        + partypath + "/comparebids-1.0.0"),
+                                                        + partypath + "/" + COB_PARTY),
                                         new Parameters());
                         return new PartyWithProfile(cobparty, cobprof);

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

@@ -187 +187 @@
                 String query = "?a=2&partial=4";
                 PartyWithProfile partyprofile = AllPermutationsSettings.makeCob(
-                                new PartyRef(partybase + "simpleshaop-1.0.0"),
+                                new PartyRef(partybase + AllPermutationsSettings.COB_PARTY),
                                 new ProfileRef(profilebase + query));
                 assertEquals(profilebase,
                                 partyprofile.getProfile().getURI().toString());
-                assertEquals(partybase + "comparebids-1.0.0",
+                assertEquals(partybase + AllPermutationsSettings.COB_PARTY,
                                 partyprofile.getParty().getPartyRef().getURI().toString());
         }