Changeset 10 for profile

Timestamp:

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

Author:

bart

Message:

Update 28 jan 2020

Location:

profile/src

Files:

• main/java/geniusweb/profile/DefaultPartialOrdering.java (modified) (7 diffs)
• main/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilities.java (modified) (2 diffs)
• main/java/geniusweb/profile/utilityspace/LinearAdditive.java (added)
• main/java/geniusweb/profile/utilityspace/LinearAdditiveUtilitySpace.java (modified) (3 diffs)
• main/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpace.java (modified) (2 diffs)
• test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java (modified) (4 diffs)

profile/src/main/java/geniusweb/profile/DefaultPartialOrdering.java

@@ -26 +26 @@
  * limited anyway.
  */
-public class DefaultPartialOrdering extends DefaultProfile implements PartialOrdering {
+public class DefaultPartialOrdering extends DefaultProfile
+                implements PartialOrdering {
 
         /**
@@ -40 +41 @@
          * @param reservationbid
          * @param bids
-         * @param isbetterList   a list of tuples [bid1index, bid2index]. It indicates
-         *                       that bids[bid1index] isbetterthan bids[bid2index].
+         * @param isbetterList   a list of tuples [bid1index, bid2index]. It
+         *                       indicates that bids[bid1index] isbetterthan
+         *                       bids[bid2index].
          */
         @JsonCreator
-        public DefaultPartialOrdering(@JsonProperty("name") String name, @JsonProperty("domain") Domain domain,
-                        @JsonProperty("reservationBid") Bid reservationbid, @JsonProperty("bids") List<Bid> bids,
+        public DefaultPartialOrdering(@JsonProperty("name") String name,
+                        @JsonProperty("domain") Domain domain,
+                        @JsonProperty("reservationBid") Bid reservationbid,
+                        @JsonProperty("bids") List<Bid> bids,
                         @JsonProperty("better") List<List<Integer>> isbetterList) {
                 this(name, domain, reservationbid, makeBidMap(bids, isbetterList));
@@ -54 +58 @@
          * @param domain         the {@link Domain} description
          * @param reservationbid the reservation {@link Bid}
-         * @param isBetterMap    a map with keys = a better bid and value=a less good
-         *                       bid.
+         * @param isBetterMap    a map with keys = a better bid and value=a less
+         *                       good bid.
          */
-        public DefaultPartialOrdering(String name, Domain domain, Bid reservationbid, Map<Bid, Set<Bid>> isBetterMap) {
+        public DefaultPartialOrdering(String name, Domain domain,
+                        Bid reservationbid, Map<Bid, Set<Bid>> isBetterMap) {
                 super(name, domain, reservationbid);
                 this.isBetter = isBetterMap;
@@ -71 +76 @@
         /**
          * 
-         * @return a list with all the bids
+         * @return a list with all the bids that are referred to, either as better
+         *         or as worse than another bid
          */
         @JsonGetter
@@ -97 +103 @@
                         if (isBetter.containsKey(bid)) {
                                 for (Bid worsebid : isBetter.get(bid)) {
-                                        betterlist.add(Arrays.asList(bidslist.indexOf(bid), bidslist.indexOf(worsebid)));
+                                        betterlist.add(Arrays.asList(bidslist.indexOf(bid),
+                                                        bidslist.indexOf(worsebid)));
                                 }
                         }
@@ -107 +114 @@
         @Override
         public String toString() {
-                return "DefaultPartialOrdering[" + getValuesString() + "," + isBetter + "]";
+                return "DefaultPartialOrdering[" + getValuesString() + "," + isBetter
+                                + "]";
         }
 
-        private static Map<Bid, Set<Bid>> makeBidMap(List<Bid> bids, List<List<Integer>> isBetterList) {
+        private static Map<Bid, Set<Bid>> makeBidMap(List<Bid> bids,
+                        List<List<Integer>> isBetterList) {
                 Map<Bid, Set<Bid>> betterMap = new HashMap<>();
 
                 for (List<Integer> tuple : isBetterList) {
                         if (tuple.size() != 2) {
-                                throw new IllegalArgumentException("Expected tuple but found " + tuple + "in " + isBetterList);
+                                throw new IllegalArgumentException("Expected tuple but found "
+                                                + tuple + "in " + isBetterList);
                         }
                         Bid betterbid = bids.get(tuple.get(0));
@@ -133 +143 @@
                 final int prime = 31;
                 int result = super.hashCode();
-                result = prime * result + ((isBetter == null) ? 0 : isBetter.hashCode());
+                result = prime * result
+                                + ((isBetter == null) ? 0 : isBetter.hashCode());
                 return result;
         }

profile/src/main/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilities.java

@@ -2 +2 @@
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -68 +69 @@
         }
 
+        /**
+         * @return copy of the value-utility pair map.
+         */
+        public Map<DiscreteValue, BigDecimal> getUtilities() {
+                return Collections.unmodifiableMap(valueUtilities);
+        }
+
         @Override
         public String isFitting(ValueSet valueset) {

profile/src/main/java/geniusweb/profile/utilityspace/LinearAdditiveUtilitySpace.java

@@ -25 +25 @@
  */
 @JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE)
-public class LinearAdditiveUtilitySpace implements UtilitySpace {
+public class LinearAdditiveUtilitySpace implements LinearAdditive {
 
         private final String name;
@@ -131 +131 @@
         }
 
-        /**
-         * 
-         * @param issue the issue to get weighted util for
-         * @param value the issue value to use (typically coming from a bid)
-         * @return weighted util of just the issue value:
-         *         issueUtilities[issue].utility(value) * issueWeights[issue)
-         */
-        private BigDecimal util(String issue, Value value) {
-                return issueWeights.get(issue)
-                                .multiply(issueUtilities.get(issue).getUtility(value));
-        }
-
+        @Override
         public BigDecimal getWeight(String issue) {
                 return issueWeights.get(issue);
@@ -220 +209 @@
         }
 
-        /**
-         * @return the map from issue names to valuesetutilities (un-weighted)
-         */
+        @Override
         public Map<String, ValueSetUtilities> getUtilities() {
                 return Collections.unmodifiableMap(issueUtilities);
         }
 
-        /**
-         * 
-         * @return the map from issue names to weights. weights sum to 1.
-         */
+        @Override
         public Map<String, BigDecimal> getWeights() {
                 return Collections.unmodifiableMap(issueWeights);
         }
 
+        /**
+         * 
+         * @param issue the issue to get weighted util for
+         * @param value the issue value to use (typically coming from a bid)
+         * @return weighted util of just the issue value:
+         *         issueUtilities[issue].utility(value) * issueWeights[issue)
+         */
+        private BigDecimal util(String issue, Value value) {
+                return issueWeights.get(issue)
+                                .multiply(issueUtilities.get(issue).getUtility(value));
+        }
+
 }

profile/src/main/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpace.java

@@ -84 +84 @@
          * grouping.
          * 
-         * @param las the {@link LinearAdditiveUtilitySpace} to be converted/copied.
-         * 
-         */
-        public SumOfGroupsUtilitySpace(LinearAdditiveUtilitySpace las) {
+         * @param las the {@link LinearAdditive} to be converted/copied.
+         * 
+         */
+        public SumOfGroupsUtilitySpace(LinearAdditive las) {
                 this(las.getDomain(), las.getName(), las2parts(las),
                                 las.getReservationBid());
@@ -212 +212 @@
         /**
          * 
-         * @param las a {@link LinearAdditiveUtilitySpace}
+         * @param las a {@link LinearAdditive}
          * @return a Map with partname-PartsUtilities. The partnames are identical
          *         to the issues in the given las.
          */
         private static HashMap<String, PartsUtilities> las2parts(
-                        LinearAdditiveUtilitySpace las) {
+                        LinearAdditive las) {
 
                 HashMap<String, PartsUtilities> map = new HashMap<>();

profile/src/test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Arrays;
@@ -8 +9 @@
 
 import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import geniusweb.issuevalue.DiscreteValue;
@@ -35 +41 @@
                         lowval1, low1util, highvalb, highutil);
         private static final BigDecimal ZERO_1 = new BigDecimal("0.1");
+        private final String utilstring = "{\"numberutils\":{\"lowValue\":12.5,\"lowUtility\":0.5,\"highValue\":18.5,\"highUtility\":0.9}}";
+
+        private static final ObjectMapper jackson = new ObjectMapper();
 
         @Override
@@ -173 +182 @@
         }
 
+        @Test
+        public void testSerialize() throws JsonProcessingException {
+
+                String json = jackson.writeValueAsString(valueset1);
+                System.out.println(json);
+                assertEquals(utilstring, json);
+        }
+
+        @Test
+        public void testDeserialize()
+                        throws JsonParseException, JsonMappingException, IOException {
+                ValueSetUtilities valueutils = jackson.readValue(utilstring,
+                                ValueSetUtilities.class);
+                assertEquals(valueset1, valueutils);
+
+        }
+
 }