Changeset 10 for bidspace/src/main/java

Timestamp:

01/28/20 10:19:54 (5 years ago)

Author:

bart

Message:

Update 28 jan 2020

Location:

bidspace/src/main/java/geniusweb/bidspace

Files:

• BidsWithUtility.java (modified) (7 diffs)
• Interval.java (modified) (1 diff)
• IssueInfo.java (modified) (1 diff)
• pareto/ParetoLinearAdditive.java (modified) (3 diffs)
• pareto/ParetoPoint.java (modified) (2 diffs)
• pareto/PartialPareto.java (modified) (3 diffs)

bidspace/src/main/java/geniusweb/bidspace/BidsWithUtility.java

@@ -12 +12 @@
 import geniusweb.issuevalue.Domain;
 import geniusweb.issuevalue.Value;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 import tudelft.utilities.immutablelist.AbstractImmutableList;
 import tudelft.utilities.immutablelist.FixedList;
@@ -22 +22 @@
 /**
  * Tool class containing functions dealing with utilities of all bids in a given
- * {@link LinearAdditiveUtilitySpace}. This class caches previously computed
- * values to accelerate the calls and subsequent calls. Re-use the object to
- * keep/reuse the cache.
+ * {@link LinearAdditive}. This class caches previously computed values to
+ * accelerate the calls and subsequent calls. Re-use the object to keep/reuse
+ * the cache.
  * <h1>Rounding</h1> Internally, utilities of bids are rounded to the given
  * precision. This may cause inclusion/exclusion of some bids in the results.
- * See {@link #BidsWithUtility(LinearAdditiveUtilitySpace, int)} for more
- * details
+ * See {@link #BidsWithUtility(LinearAdditive, int)} for more details
  */
 public class BidsWithUtility {
@@ -44 +43 @@
          * Default constructor, uses default precision 6. This value seems practical
          * for the common range of issues, utilities and weights. See
-         * {@link #BidsWithUtil(LinearAdditiveUtilitySpace, int)} for more details
-         * on the precision.
-         * 
-         * @param space the {@link LinearAdditiveUtilitySpace} to analyze
-         */
-        public BidsWithUtility(LinearAdditiveUtilitySpace space) {
+         * {@link #BidsWithUtil(LinearAdditive, int)} for more details on the
+         * precision.
+         * 
+         * @param space the {@link LinearAdditive} to analyze
+         */
+        public BidsWithUtility(LinearAdditive space) {
                 this(space, 6);
         }
@@ -55 +54 @@
         /**
          * 
-         * @param space     the {@link LinearAdditiveUtilitySpace} to analyze
+         * @param space     the {@link LinearAdditive} to analyze
          * @param precision the number of digits to use for computations. In
          *                  practice, 6 seems a good default value.
@@ -77 +76 @@
          * 
          */
-        public BidsWithUtility(LinearAdditiveUtilitySpace space, int precision) {
+        public BidsWithUtility(LinearAdditive space, int precision) {
                 this(getInfo(space, precision), precision);
         }
@@ -119 +118 @@
         public List<IssueInfo> getInfo() {
                 return Collections.unmodifiableList(issueInfo);
+        }
+
+        /**
+         * 
+         * @param isMax the extreme bid required
+         * @return the extreme bid, either the minimum if isMax=false or maximum if
+         *         isMax=true
+         */
+        public Bid getExtremeBid(boolean isMax) {
+                Map<String, Value> map = new HashMap<>();
+                for (IssueInfo info : issueInfo) {
+                        map.put(info.getName(), info.getExtreme(isMax));
+                }
+                return new Bid(map);
         }
 
@@ -154 +167 @@
         }
 
-        private static List<IssueInfo> getInfo(LinearAdditiveUtilitySpace space2,
+        private static List<IssueInfo> getInfo(LinearAdditive space2,
                         int precision) {
                 Domain dom = space2.getDomain();

bidspace/src/main/java/geniusweb/bidspace/Interval.java

@@ -137 +137 @@
                         if (other.max != null)
                                 return false;
-                } else if (!max.equals(other.max))
+
+                } else if (max.compareTo(other.max) != 0)
+                        // THIS WAS FIXED MANUALLY TO USE COMPARETO
                         return false;
                 if (min == null) {
                         if (other.min != null)
                                 return false;
-                } else if (!min.equals(other.min))
+                } else if (min.compareTo(other.min) != 0)
+                        // THIS WAS FIXED MANUALLY TO USE COMPARETO
                         return false;
                 return true;

bidspace/src/main/java/geniusweb/bidspace/IssueInfo.java

@@ -49 +49 @@
         public Interval getInterval() {
                 return interval;
+        }
+
+        /**
+         * 
+         * @param isMax
+         * @return the extreme value, either the minimum if isMax=false or maximum
+         *         if isMax=true
+         */
+        public Value getExtreme(boolean isMax) {
+                BigDecimal extremeutil = null;
+                Value extremeval = null;
+                for (Value val : values) {
+                        BigDecimal util = weightedUtils.get(val);
+                        if (extremeval == null) {
+                                extremeutil = weightedUtils.get(val);
+                                extremeval = val;
+                        } else {
+                                if (isMax) {
+                                        if (util.compareTo(extremeutil) > 0) {
+                                                extremeutil = util;
+                                                extremeval = val;
+                                        }
+                                } else {
+                                        if (util.compareTo(extremeutil) < 0) {
+                                                extremeutil = util;
+                                                extremeval = val;
+                                        }
+
+                                }
+                        }
+                }
+                return extremeval;
         }
 

bidspace/src/main/java/geniusweb/bidspace/pareto/ParetoLinearAdditive.java

@@ -10 +10 @@
 import geniusweb.issuevalue.Domain;
 import geniusweb.profile.Profile;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 
 /**
- * pareto frontier implementation for {@link LinearAdditiveUtilitySpace}.
- * Simplistic implementation that iterates over all bids.
+ * pareto frontier implementation for {@link LinearAdditive}. Simplistic
+ * implementation that iterates over all bids.
  */
 public class ParetoLinearAdditive implements ParetoFrontier {
 
-        private final List<LinearAdditiveUtilitySpace> utilSpaces;
+        private final List<LinearAdditive> utilSpaces;
         private Set<Bid> points = null;
         // all issues in a deterministic order
@@ -24 +24 @@
         /**
          * 
-         * @param utilSpaces. Must contain at least two
-         *                    {@link LinearAdditiveUtilitySpace}s and all must be
-         *                    defined on the same donain.
+         * @param utilSpaces. Must contain at least two {@link LinearAdditive}s and
+         *                    all must be defined on the same donain.
          */
-        public ParetoLinearAdditive(List<LinearAdditiveUtilitySpace> utilSpaces) {
+        public ParetoLinearAdditive(List<LinearAdditive> utilSpaces) {
                 if (utilSpaces == null || utilSpaces.size() < 2) {
                         throw new IllegalArgumentException(
@@ -34 +33 @@
                 }
                 Domain domain = utilSpaces.get(0).getDomain();
-                for (LinearAdditiveUtilitySpace space : utilSpaces) {
+                for (LinearAdditive space : utilSpaces) {
                         if (!space.getDomain().equals(domain)) {
                                 throw new IllegalArgumentException(

bidspace/src/main/java/geniusweb/bidspace/pareto/ParetoPoint.java

@@ -10 +10 @@
 import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.Value;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 
 /**
@@ -26 +26 @@
          * 
          * @param bid    a (possibly partial) {@link Bid}
-         * @param spaces the {@link LinearAdditiveUtilitySpace}s to consider
+         * @param spaces the {@link LinearAdditive}s to consider
          */
-        public ParetoPoint(Bid bid, List<LinearAdditiveUtilitySpace> spaces) {
+        public ParetoPoint(Bid bid, List<LinearAdditive> spaces) {
                 this.bid = bid;
                 utilities = new ArrayList<>();
-                for (LinearAdditiveUtilitySpace space : spaces) {
+                for (LinearAdditive space : spaces) {
                         utilities.add(space.getUtility(bid));
                 }

bidspace/src/main/java/geniusweb/bidspace/pareto/PartialPareto.java

@@ -8 +8 @@
 import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.Value;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 
 /**
@@ -28 +28 @@
          * implemented recursively (O(log(#issues))).
          * 
-         * @param utilSpaces the {@link LinearAdditiveUtilitySpace}s
+         * @param utilSpaces the {@link LinearAdditive}s
          * @param issues     the issues (subset of all issues in the space) to be
          *                   used for this pareto
@@ -34 +34 @@
          *         given issues.
          */
-        public static PartialPareto create(
-                        List<LinearAdditiveUtilitySpace> utilSpaces, List<String> issues) {
+        public static PartialPareto create(List<LinearAdditive> utilSpaces,
+                        List<String> issues) {
 
                 if (issues.size() == 1) {