Changeset 24 for exampleparties/timedependentparty

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:

exampleparties/timedependentparty

Files:

• pom.xml (modified) (6 diffs)
• src/main/java/geniusweb/exampleparties/timedependentparty/ExtendedUtilSpace.java (modified) (2 diffs)
• src/main/java/geniusweb/exampleparties/timedependentparty/TimeDependentParty.java (modified) (2 diffs)
• src/test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java (modified) (3 diffs)

exampleparties/timedependentparty/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb.exampleparties</groupId>
         <artifactId>timedependentparty</artifactId>
-        <version>1.5.2</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.5.3</version> <!-- must equal ${geniusweb.version} -->
         <packaging>jar</packaging>
 
@@ -17 +17 @@
                 <passwd>${env.ARTIFACTORY_PASS}</passwd>
                 <jackson-2-version>2.9.10</jackson-2-version>
-                <geniusweb.version>1.5.2</geniusweb.version>
+                <geniusweb.version>1.5.3</geniusweb.version>
         </properties>
 
@@ -34 +34 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>party</artifactId>
-        <version>${geniusweb.version}</version>
+                        <version>${geniusweb.version}</version>
                 </dependency>
 
@@ -40 +40 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>bidspace</artifactId>
-        <version>${geniusweb.version}</version>
+                        <version>${geniusweb.version}</version>
                 </dependency>
                 <dependency>
                         <groupId>geniusweb</groupId>
                         <artifactId>profileconnection</artifactId>
-        <version>${geniusweb.version}</version>
+                        <version>${geniusweb.version}</version>
                 </dependency>
                 <dependency>
@@ -188 +188 @@
                                 <groupId>org.apache.maven.plugins</groupId>
                                 <artifactId>maven-javadoc-plugin</artifactId>
-                                <version>2.10.1</version>
+                                <version>3.2.0</version>
                                 <executions>
                                         <execution>
@@ -195 +195 @@
                                                         <goal>jar</goal>
                                                 </goals>
-                                                <configuration>
-                                                        <additionalparam>${javadoc.opts}</additionalparam>
-                                                        <additionalparam>-Xdoclint:none</additionalparam>
-                                                </configuration>
                                         </execution>
                                 </executions>

exampleparties/timedependentparty/src/main/java/geniusweb/exampleparties/timedependentparty/ExtendedUtilSpace.java

@@ -21 +21 @@
 public class ExtendedUtilSpace {
         private LinearAdditive utilspace;
-        private BigDecimal tolerance; // utility tolerance for a bid.
+        /**
+         * The tolerance for a utility. Generally utilities can be this amount
+         * smaller than requested. See also {@link #computeTolerance()}.
+         */
+        private BigDecimal tolerance;
         private BidsWithUtility bidutils;
         // min and max achievable utility
@@ -92 +96 @@
 
         /**
-         * @param utilityGoal
-         * @return bids with utility inside [utilitygoal-tolerance, utilitygoal]
+         * @param utilityGoal the requested utility
+         * @return bids with utility inside [utilitygoal-{@link #tolerance},
+         *         utilitygoal]
          */
         public ImmutableList<Bid> getBids(BigDecimal utilityGoal) {

exampleparties/timedependentparty/src/main/java/geniusweb/exampleparties/timedependentparty/TimeDependentParty.java

@@ -34 +34 @@
  * brute-force search through the bidspace and can handle bidspace sizes up to
  * 2^31 (approx 1 billion bids). It may take excessive time and run out of time
- * on bidspaces > 10000 bids. In special cases it may even run out of memory,
+ * on bidspaces > 10000 bids. In special cases it may even run out of memory,
  */
 public class TimeDependentParty extends DefaultParty {
@@ -104 +104 @@
          *         behaviour [1]:
          * 
-         *         1. Boulware: For this strategy e < 1 and the initial offer is
+         *         1. Boulware: For this strategy e &lt; 1 and the initial offer is
          *         maintained till time is almost exhausted, when the agent concedes
          *         up to its reservation value.
          * 
-         *         2. Conceder: For this strategy e > 1 and the agent goes to its
+         *         2. Conceder: For this strategy e &gt; 1 and the agent goes to its
          *         reservation value very quickly.
          * 

exampleparties/timedependentparty/src/test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java

@@ -8 +8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -35 +36 @@
 import geniusweb.connection.ConnectionEnd;
 import geniusweb.inform.ActionDone;
+import geniusweb.inform.Agreements;
 import geniusweb.inform.Finished;
 import geniusweb.inform.Inform;
@@ -181 +183 @@
                 party.connect(connection);
                 party.notifyChange(settings);
-                party.notifyChange(new Finished(null));
+                Agreements agreements = mock(Agreements.class);
+                when(agreements.toString()).thenReturn("agree");
+
+                party.notifyChange(new Finished(agreements));
 
                 verify(reporter).log(eq(Level.INFO),
-                                eq("Final ourcome:Finished[null]"));
+                                eq("Final ourcome:Finished[agree]"));
         }