Changeset 18 for opponentmodel/src/main/java

Timestamp:

06/11/20 16:34:40 (4 years ago)

Author:

bart

Message:

Update to version 1.41

Location:

opponentmodel/src/main/java/geniusweb/opponentmodel

Files:

• FrequencyOpponentModel.java (modified) (9 diffs)
• OpponentModel.java (modified) (1 diff)

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

@@ -6 +6 @@
 import java.util.stream.Collectors;
 
+import geniusweb.actions.Action;
+import geniusweb.actions.Offer;
 import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.Domain;
@@ -12 +14 @@
 import geniusweb.profile.utilityspace.NumberValueSetUtilities;
 import geniusweb.profile.utilityspace.UtilitySpace;
+import geniusweb.progress.Progress;
 
 /**
@@ -23 +26 @@
  *
  */
-public class FrequencyOpponentModel implements OpponentModel, UtilitySpace {
+public class FrequencyOpponentModel implements UtilitySpace, OpponentModel {
 
         private static final int DECIMALS = 4; // accuracy of our computations.
@@ -32 +35 @@
 
         public FrequencyOpponentModel(Domain domain) {
-                // map with empth hashmap for each issue.
+                /*
+                 * 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,
                                 domain.getIssues().stream().collect(
@@ -39 +46 @@
         }
 
+        /**
+         * internal constructor. Assumes the freqs keyset is equal to the available
+         * issues.
+         * 
+         * @param domain the domain
+         * @param freqs  the observed frequencies for all issue values. This map is
+         *               assumed to be a fresh private-access only copy.
+         * @param total  the total number of bids contained in the freqs map. This
+         *               must be equal to the sum of the Integer values in the
+         *               {@link #bidFrequencies} for each issue (this is not
+         *               checked).
+         */
+        private FrequencyOpponentModel(Domain domain,
+                        Map<String, Map<Value, Integer>> freqs, BigDecimal total) {
+                if (domain == null) {
+                        throw new NullPointerException("domain=null");
+                }
+                this.domain = domain;
+                this.bidFrequencies = freqs;
+                this.totalBids = total;
+        }
+
         @Override
         public BigDecimal getUtility(Bid bid) {
@@ -86 +115 @@
         }
 
-        @Override
-        public FrequencyOpponentModel update(Bid bid) {
+        /**
+         * {@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) {
+                if (!(action instanceof Offer))
+                        return this;
+
+                Bid bid = ((Offer) action).getBid();
                 String err = domain.isComplete(bid);
                 if (err != null) {
@@ -108 +147 @@
 
         /**
-         * internal constructor. Assumes the freqs keyset is equal to the available
-         * issues.
-         * 
-         * @param domain the domain
-         * @param freqs  the observed frequencies for all issue values. This map is
-         *               assumed to be a fresh private-access only copy.
-         * @param total  the total number of bids contained in the freqs map. This
-         *               must be equal to the sum of the Integer values in the
-         *               {@link #bidFrequencies} for each issue (this is not
-         *               checked).
-         */
-        private FrequencyOpponentModel(Domain domain,
-                        Map<String, Map<Value, Integer>> freqs, BigDecimal total) {
-                if (domain == null) {
-                        throw new NullPointerException("domain=null");
-                }
-                this.domain = domain;
-                this.bidFrequencies = freqs;
-                this.totalBids = total;
-        }
-
-        /**
          * 
          * @param freqs
@@ -141 +158 @@
                 }
                 return map;
+        }
+
+        @Override
+        public Bid getReservationBid() {
+                // don't throw but we really have no clue.
+                return new Bid(new HashMap<>());
         }
 
@@ -188 +211 @@
         }
 
-        @Override
-        public Bid getReservationBid() {
-                throw new UnsupportedOperationException();
-        }
-
 }

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

@@ -1 +1 @@
 package geniusweb.opponentmodel;
 
-import geniusweb.issuevalue.Bid;
+import geniusweb.actions.Action;
+import geniusweb.issuevalue.Domain;
 import geniusweb.profile.Profile;
 import geniusweb.profile.utilityspace.UtilitySpace;
+import geniusweb.progress.Progress;
 
 /**
  * An opponentmodel estimates a {@link UtilitySpace} from received opponent
- * bids.
+ * actions.
+ * <h1>Requirement</h1> A OpponentModel must have a constructor that takes the
+ * Domain as argument. unfortunately this can not be enforced in a java
+ * interface
  */
 public interface OpponentModel extends Profile {
+
         /**
-         *
-         * @param bid the next bid that was received
-         * @return a new {@link OpponentModel} that takes the next bid into account.
+         * Update this with a new action that was done by the opponent that this
+         * model is modeling. {@link #with(Domain)} must be called before calling
+         * this.
+         * 
+         * @param action   the new incoming action.
+         * @param progress the current progress of the negotiation. Calls to this
+         *                 must be done with increasing progress.
+         * @return the updated {@link OpponentModel}
          */
-        OpponentModel update(Bid bid);
+        OpponentModel with(Action action, Progress progress);
 
 }