Changeset 20 for opponentmodel

Timestamp:

08/05/20 09:42:15 (4 years ago)

Author:

bart

Message:

Added BOA support, some bug fixes

Location:

opponentmodel

Files:

• bin (added)
• bin/pom.xml (added)
• bin/src (added)
• bin/src/main (added)
• bin/src/main/java (added)
• bin/src/main/java/geniusweb (added)
• bin/src/main/java/geniusweb/opponentmodel (added)
• bin/src/test (added)
• bin/src/test/java (added)
• bin/src/test/java/geniusweb (added)
• bin/src/test/java/geniusweb/profile (added)
• bin/src/test/java/geniusweb/profile/opponentmodel (added)
• bin/target (added)
• bin/target/classes (added)
• bin/target/classes/geniusweb (added)
• bin/target/classes/geniusweb/opponentmodel (added)
• bin/target/generated-sources (added)
• bin/target/generated-sources/annotations (added)
• bin/target/maven-status (added)
• bin/target/maven-status/maven-compiler-plugin (added)
• bin/target/maven-status/maven-compiler-plugin/compile (added)
• bin/target/maven-status/maven-compiler-plugin/testCompile (added)
• bin/target/test-classes (added)
• bin/target/test-classes/geniusweb (added)
• bin/target/test-classes/geniusweb/profile (added)
• bin/target/test-classes/geniusweb/profile/opponentmodel (added)
• pom.xml (modified) (2 diffs)
• src/main/java/geniusweb/opponentmodel/FrequencyOpponentModel.java (modified) (3 diffs)
• src/main/java/geniusweb/opponentmodel/OpponentModel.java (modified) (2 diffs)
• src/test/java/geniusweb/profile/opponentmodel/FrequencyOppModelTest.java (modified) (3 diffs)

opponentmodel/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb</groupId>
         <artifactId>opponentmodel</artifactId>
-        <version>1.4.2</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.4.4</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.4.2</geniusweb.version>
+                <geniusweb.version>1.4.4</geniusweb.version>
         </properties>
 

opponentmodel/src/main/java/geniusweb/opponentmodel/FrequencyOpponentModel.java

@@ -24 +24 @@
  * (as you might expect as {@link NumberValueSetUtilities} is only affected by
  * the endpoints).
- *
+ * <p>
+ * immutable.
  */
 public class FrequencyOpponentModel implements UtilitySpace, OpponentModel {
 
         private static final int DECIMALS = 4; // accuracy of our computations.
+        private static int serial = 1; // counter for auto name generation
+
         private final Domain domain;
         private final Map<String, Map<Value, Integer>> bidFrequencies;
         private final BigDecimal totalBids;
-        private static int serial = 1; // counter for auto name generation
-
-        public FrequencyOpponentModel(Domain domain) {
-                /*
-                 * simply reset the whole model and make a new one... maybe this can be
-                 * done smarter for minor changes? map with empth hashmap for each
-                 * issue.
-                 */
-                this(domain,
+
+        public FrequencyOpponentModel() {
+                this.domain = null;
+                this.bidFrequencies = null;
+                this.totalBids = BigDecimal.ZERO;
+        }
+
+        @Override
+        public FrequencyOpponentModel with(Domain domain, Bid resBid) {
+                // FIXME merge already available frequencies?
+                return new FrequencyOpponentModel(domain,
                                 domain.getIssues().stream().collect(
                                                 Collectors.toMap(iss -> iss, iss -> new HashMap<>())),
@@ -115 +120 @@
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * <h1>change info</h1> This replaces update(Bid). Now you pass the entire
-         * action and the progress instead of just the bid.
-         */
         @Override
         public FrequencyOpponentModel with(Action action, Progress progress) {
@@ -127 +126 @@
 
                 Bid bid = ((Offer) action).getBid();
-                String err = domain.isComplete(bid);
-                if (err != null) {
-                        throw new IllegalArgumentException(err);
-                }
                 Map<String, Map<Value, Integer>> newFreqs = cloneMap(bidFrequencies);
                 for (String issue : domain.getIssues()) {
                         Map<Value, Integer> freqs = newFreqs.get(issue);
                         Value value = bid.getValue(issue);
-                        Integer oldfreq = freqs.get(value);
-                        if (oldfreq == null) {
-                                oldfreq = 0;
+                        if (value != null) {
+                                Integer oldfreq = freqs.get(value);
+                                if (oldfreq == null) {
+                                        oldfreq = 0;
+                                }
+                                freqs.put(value, oldfreq + 1);
                         }
-                        freqs.put(value, oldfreq + 1);
                 }
 

opponentmodel/src/main/java/geniusweb/opponentmodel/OpponentModel.java

@@ -2 +2 @@
 
 import geniusweb.actions.Action;
+import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.Domain;
 import geniusweb.profile.Profile;
@@ -13 +14 @@
  * Domain as argument. unfortunately this can not be enforced in a java
  * interface
+ * 
+ * <p>
+ * <em>MUST</em> have an empty constructor as these are also used as part of the
+ * BOA framework.
+ * 
  */
 public interface OpponentModel extends Profile {
+
+        /**
+         * Initializes the model. This function must be called first after
+         * constructing an instance. It can also be called later, if there is a
+         * change in the domain or resBid.
+         * 
+         * @param domain the domain to work with
+         * @param resBid the reservation bid, or null if no reservationbid is
+         *               available.
+         * @return OpponentModel that uses given domain and reservationbid.
+         * 
+         */
+        OpponentModel with(Domain domain, Bid resBid);
 
         /**

opponentmodel/src/test/java/geniusweb/profile/opponentmodel/FrequencyOppModelTest.java

@@ -87 +87 @@
                 bid3 = new Bid(issuevalues);
 
-                oppModel1 = new FrequencyOpponentModel(domain);
-                oppModel1b = new FrequencyOpponentModel(domain);
-                oppModel2 = new FrequencyOpponentModel(domain2);
-                oppModel3 = new FrequencyOpponentModel(domain3);
+                oppModel1 = new FrequencyOpponentModel().with(domain, null);
+                oppModel1b = new FrequencyOpponentModel().with(domain, null);
+                oppModel2 = new FrequencyOpponentModel().with(domain2, null);
+                oppModel3 = new FrequencyOpponentModel().with(domain3, null);
                 oppModel4 = oppModel3.with(new Offer(other, bid1), progress);
 
@@ -113 +113 @@
         @Test(expected = NullPointerException.class)
         public void smokeTestNull() {
-                new FrequencyOpponentModel(null);
+                new FrequencyOpponentModel().with((Domain) null, null);
         }
 
         @Test
         public void smokeTest() {
-                new FrequencyOpponentModel(domain);
+                new FrequencyOpponentModel().with(domain, null);
         }
 
         @Test
         public void testEmptyModel() {
-                FrequencyOpponentModel oppModel = new FrequencyOpponentModel(domain);
+                FrequencyOpponentModel oppModel = new FrequencyOpponentModel()
+                                .with(domain, null);
                 assertEquals(BigDecimal.ONE, oppModel.getUtility(bid1));
                 assertEquals(BigDecimal.ONE, oppModel.getUtility(bid2));
@@ -153 +154 @@
         }
 
+        @Test
+        public void testPartialBidUpdate() {
+                FrequencyOpponentModel oppModel = oppModel1.with(new Offer(other, bid1),
+                                progress);
+                Bid partialbid = new Bid(ISS1, I1V1);
+                oppModel.with(new Offer(other, partialbid), progress);
+        }
+
 }