Changeset 24 for events/src

Timestamp:

10/06/20 13:12:20 (4 years ago)

Author:

bart

Message:

Fixes an issue with processing maxPower of a vote. Javadoc maven plugin now uses latest version.

Location:

events/src

Files:

• main/java/geniusweb/actions/Votes.java (modified) (2 diffs)
• main/java/geniusweb/events/ActionEvent.java (modified) (1 diff)
• main/java/geniusweb/events/NegotiationEvent.java (modified) (1 diff)
• main/java/geniusweb/inform/Agreements.java (modified) (1 diff)
• main/java/geniusweb/inform/Finished.java (modified) (1 diff)
• main/java/geniusweb/inform/Inform.java (modified) (1 diff)
• main/java/geniusweb/inform/Settings.java (modified) (4 diffs)
• test/java/actions/VotesTest.java (modified) (1 diff)

events/src/main/java/geniusweb/actions/Votes.java

@@ -57 +57 @@
          * with power at most P.
          * 
-         * @param otherVotes
+         * @param otherVotes the {@link Votes}, usually from a previous round, that
+         *                   this should extend.
          * @return true iff this extends the otherVotes.
          */
@@ -65 +66 @@
                 for (Vote vote : otherVotes.getVotes()) {
                         Vote myvote = getVote(vote.getBid());
-                        if (myvote == null)
-                                return false;
-                        if (myvote.getMinPower() > vote.getMinPower())
+                        if (myvote == null || myvote.getMinPower() > vote.getMinPower()
+                                        || myvote.getMaxPower() < vote.getMaxPower())
                                 return false;
                 }

events/src/main/java/geniusweb/events/ActionEvent.java

@@ -18 +18 @@
         /**
          * 
-         * @param action
+         * @param action the {@link Action} that was done
          * @param time   the current time to use. see
          *               {@link System#currentTimeMillis()}.

events/src/main/java/geniusweb/events/NegotiationEvent.java

@@ -6 +6 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
+import geniusweb.actions.Action;
 
 /**

events/src/main/java/geniusweb/inform/Agreements.java

@@ -51 +51 @@
 
         /**
-         * @param bid
-         * @param parties
+         * @param bid     a {@link Bid} to be added
+         * @param parties {@link Set} of the {@link PartyId}s that accepted the bid
          * @return new Agreements, with the new bid/parties added.
          */

events/src/main/java/geniusweb/inform/Finished.java

@@ -15 +15 @@
          * The session finished (can be for any reason).
          * 
-         * @param agreedBid the bid that was finally agreed on; null if no
-         *                  agreement.
+         * @param agreements the {@link Agreements} that were finally agreed on.
          */
         @JsonCreator
         public Finished(@JsonProperty("agreements") Agreements agreements) {
+                if (agreements == null)
+                        throw new NullPointerException("Agreements can't be null");
                 this.agreements = agreements;
         }

events/src/main/java/geniusweb/inform/Inform.java

@@ -7 +7 @@
 
 /**
- * base class of all information sent to the {@link Party}
+ * base class of all information sent to a Party
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.WRAPPER_OBJECT)

events/src/main/java/geniusweb/inform/Settings.java

@@ -2 +2 @@
 
 import java.util.HashMap;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -13 +14 @@
 
 /**
- * Informs a {@link Party} about all settings for the upcoming negotiation
- * session. This should be sent to a party one time, so that the party knows the
- * situation.
+ * Informs a Party about all settings for the upcoming negotiation session. This
+ * should be sent to a party one time, so that the party knows the situation.
  *
  */
@@ -31 +31 @@
          * @param protocol   the protocol used in this session
          * @param progress   the {@link Progress} object used for this session
-         * @param parameters a Map<String, Object> containing initialization
-         *                   parameters for this party. The Object can be a HashMap,
-         *                   ArrayList, String, or number (Integer, Double, etc).
-         *                   The Object should not be just any Object because
-         *                   deserialization will work only with the mentioned
-         *                   types.
+         * @param parameters a {@link Map} &lt;String, Object&gt; containing
+         *                   initialization parameters for this party. The Object
+         *                   can be a HashMap, ArrayList, String, or number
+         *                   (Integer, Double, etc). The Object should not be just
+         *                   any Object because deserialization will work only with
+         *                   the mentioned types.
          */
         @JsonCreator
@@ -85 +85 @@
         /**
          * 
-         * @return a HashMap<String,Object> containing initialization parameters
-         *         that can be used by the party.
+         * @return a {@link HashMap}&lt;String,Object&gt; containing initialization
+         *         parameters that can be used by the party.
          */
         public HashMap<String, Object> getParameters() {

events/src/test/java/actions/VotesTest.java

@@ -94 +94 @@
 
         @Test
-        public void isExtendingTestLessPower() {
-                Vote powervoteA1 = new Vote(partyA, bid1, 3, 9);
-                Votes powerVotes = new Votes(partyA, Arrays.asList(powervoteA1));
-                assertFalse(powerVotes.isExtending(votes1));
-                assertTrue(votes1.isExtending(powerVotes));
+        public void isExtendingIdenticalVotes() {
+                assertTrue(votes1.isExtending(votes1));
+        }
+
+        @Test
+        public void isReallyExtendingVotesMin() {
+                Vote powervoteA1 = new Vote(partyA, bid1, 1, 9);
+                Votes powerVotes = new Votes(partyA,
+                                Arrays.asList(powervoteA1, voteA2));
+                assertTrue(powerVotes.isExtending(votes1));
+        }
+
+        @Test
+        public void isReallyExtendingVotesMax() {
+                Vote powervoteA1 = new Vote(partyA, bid1, 2, 10);
+                Votes powerVotes = new Votes(partyA,
+                                Arrays.asList(powervoteA1, voteA2));
+                assertTrue(powerVotes.isExtending(votes1));
+        }
+
+        @Test
+        public void IsNarrowingOneVoteRemoved() {
+                Votes narrowVotes = new Votes(partyA, Arrays.asList(voteA2));
+                assertFalse(narrowVotes.isExtending(votes1));
+        }
+
+        @Test
+        public void isNarrowingTestMoreMinPower() {
+                Vote narrowVoteA1 = new Vote(partyA, bid1, 3, 9);
+                Votes narrowVotes = new Votes(partyA,
+                                Arrays.asList(narrowVoteA1, voteA2));
+                assertFalse(narrowVotes.isExtending(votes1));
+                assertTrue(votes1.isExtending(narrowVotes));
+        }
+
+        @Test
+        public void isNarrowingLessMaxPower() {
+                Vote powervoteA1 = new Vote(partyA, bid1, 2, 8);
+                Votes narrowVotes = new Votes(partyA,
+                                Arrays.asList(powervoteA1, voteA2));
+                assertFalse(narrowVotes.isExtending(votes1));
+                assertTrue(votes1.isExtending(narrowVotes));
         }