Changeset 22 for exampleparties/randomparty

Timestamp:

09/22/20 16:26:36 (4 years ago)

Author:

bart

Message:

Minor fixes

Location:

exampleparties/randomparty

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java (modified) (3 diffs)

exampleparties/randomparty/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb.exampleparties</groupId>
         <artifactId>randomparty</artifactId>
-        <version>1.5.0</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.5.1</version> <!-- must equal ${geniusweb.version} -->
         <packaging>jar</packaging>
 
@@ -17 +17 @@
                 <passwd>${env.ARTIFACTORY_PASS}</passwd>
                 <jackson-2-version>2.9.6</jackson-2-version>
-                <geniusweb.version>1.5.0</geniusweb.version>
+                <geniusweb.version>1.5.1</geniusweb.version>
         </properties>
 

exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java

@@ -39 +39 @@
  * A simple party that places random bids and accepts when it receives an offer
  * with sufficient utility.
- * <h2>voting</h2> If the party receives a parameter "minPower", it will
- * {@link Vote} using that minPower instead of the default value 2 if it
- * receives a {@link Voting} request.
+ * <h2>parameters</h2>
+ * <table>
+ * <tr>
+ * <td>minPower</td>
+ * <td>This value is used as minPower for placed {@link Vote}s. Default value is
+ * 2.</td>
+ * </tr>
+ * <tr>
+ * <td>maxPower</td>
+ * <td>This value is used as maxPower for placed {@link Vote}s. Default value is
+ * infinity.</td>
+ * </tr>
+ * </table>
  */
 public class RandomParty extends DefaultParty {
@@ -109 +119 @@
         @Override
         public String getDescription() {
-                return "places random bids until it can accept an offer with utility >0.6";
+                return "places random bids until it can accept an offer with utility >0.6. "
+                                + "Parameters minPower and maxPower can be used to control voting behaviour.";
         }
 
@@ -164 +175 @@
          */
         private Votes vote(Voting voting) throws IOException {
-                Object val = settings.getParameters().get("minPowwer");
-                Integer n = (val instanceof Integer) ? (Integer) val : 2;
-                for (Bid bid : voting.getBids()) {
-                        System.out.println("Bid " + bid + "="
-                                        + ((UtilitySpace) profileint.getProfile()).getUtility(bid));
-                }
+                Object val = settings.getParameters().get("minPower");
+                Integer minpower = (val instanceof Integer) ? (Integer) val : 2;
+                val = settings.getParameters().get("maxPower");
+                Integer maxpower = (val instanceof Integer) ? (Integer) val
+                                : Integer.MAX_VALUE;
+
                 List<Vote> votes = voting.getBids().stream().distinct()
-                                .filter(bid -> isGood(bid)).map(bid -> new Vote(me, bid, n))
+                                .filter(bid -> isGood(bid))
+                                .map(bid -> new Vote(me, bid, minpower, maxpower))
                                 .collect(Collectors.toList());
                 return new Votes(me, votes);