Changeset 9 for profile/src

Timestamp:

11/28/19 14:40:48 (5 years ago)

Author:

bart

Message:

Release 1.1.0

Location:

profile/src

Files:

• main/java/geniusweb/profile/Profile.java (modified) (3 diffs)
• main/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilities.java (modified) (6 diffs)
• main/java/geniusweb/profile/utilityspace/NumberValueSetUtilities.java (modified) (1 diff)
• main/java/geniusweb/profile/utilityspace/PartsUtilities.java (added)
• main/java/geniusweb/profile/utilityspace/ProductOfValue.java (added)
• main/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpace.java (added)
• test/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilitiesTest.java (modified) (3 diffs)
• test/java/geniusweb/profile/utilityspace/LinearAdditiveTest.java (modified) (3 diffs)
• test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java (modified) (1 diff)
• test/java/geniusweb/profile/utilityspace/PartsUtilitiesTest.java (added)
• test/java/geniusweb/profile/utilityspace/ProductOfValueTest.java (added)
• test/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpaceTest.java (added)
• test/resources/party1.json (modified) (1 diff)

profile/src/main/java/geniusweb/profile/Profile.java

@@ -7 +7 @@
 import geniusweb.issuevalue.Domain;
 import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.SumOfGroupsUtilitySpace;
 
 /**
@@ -17 +18 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.WRAPPER_OBJECT)
 @JsonSubTypes({ @JsonSubTypes.Type(value = LinearAdditiveUtilitySpace.class),
-                @JsonSubTypes.Type(value = DefaultPartialOrdering.class) })
+                @JsonSubTypes.Type(value = DefaultPartialOrdering.class),
+                @JsonSubTypes.Type(value = SumOfGroupsUtilitySpace.class) })
 public interface Profile {
 
@@ -33 +35 @@
         /**
          * 
-         * @return a (hypothetical) bid that is the best alternative to a non-agreement.
-         *         Only bids that are {@link #isPreferredOrEqual(Bid, Bid)} should be
-         *         accepted. If a negotiation does not reach an agreement, the party can
-         *         get this offer somewhere else. This replaces the older notion of a
+         * @return a (hypothetical) bid that is the best alternative to a
+         *         non-agreement. Only bids that are
+         *         {@link #isPreferredOrEqual(Bid, Bid)} should be accepted. If a
+         *         negotiation does not reach an agreement, the party can get this
+         *         offer somewhere else. This replaces the older notion of a
          *         "reservation value" and is more general. If null, there is no
          *         reservation bid and any agreement is better than no agreement.

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

@@ -8 +8 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 import geniusweb.issuevalue.DiscreteValue;
@@ -13 +14 @@
 import geniusweb.issuevalue.Value;
 import geniusweb.issuevalue.ValueSet;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
@@ -37 +36 @@
          * create new object based on the given mapping from values to utilities.
          * 
-         * @param valueUtils map with key {@link DiscreteValue}s and value a Double in
-         *                   the range [0,1].
+         * @param valueUtils map with key {@link DiscreteValue}s and value a Double
+         *                   in the range [0,1].
          * @throws NullPointerException     if one of the args is null
          * @throws IllegalArgumentException if values are not in range [0,1].
          */
-        public DiscreteValueSetUtilities(Map<DiscreteValue, BigDecimal> valueUtils) {
+        public DiscreteValueSetUtilities(
+                        Map<DiscreteValue, BigDecimal> valueUtils) {
                 if (valueUtils == null) {
                         throw new NullPointerException("valueUtils==null");
                 }
                 if (valueUtils.keySet().contains(null)) {
-                        throw new NullPointerException("one of the keys in valueUtils is null");
+                        throw new NullPointerException(
+                                        "one of the keys in valueUtils is null");
                 }
                 if (valueUtils.values().stream()
-                                .anyMatch(v -> v == null || v.compareTo(BigDecimal.ZERO) < 0 || v.compareTo(BigDecimal.ONE) > 0)) {
-                        throw new IllegalArgumentException("Weights in valueUtils must all be in [0,1]");
+                                .anyMatch(v -> v == null || v.compareTo(BigDecimal.ZERO) < 0
+                                                || v.compareTo(BigDecimal.ONE) > 0)) {
+                        throw new IllegalArgumentException(
+                                        "Weights in valueUtils must all be in [0,1]");
                 }
                 this.valueUtilities.putAll(valueUtils);
@@ -68 +71 @@
         public String isFitting(ValueSet valueset) {
                 if (!(valueset instanceof DiscreteValueSet)) {
-                        return "The utilities are for a discrete valueset but the given values are " + valueset;
+                        return "The utilities are for a discrete valueset but the given values are "
+                                        + valueset;
                 }
                 DiscreteValueSet discvalueset = (DiscreteValueSet) valueset;
-                if (!valueUtilities.keySet().equals(new HashSet<>(discvalueset.getValues())))
-                        return "The values in the set " + valueset + " do not match the values mapped to utilities "
+                if (!valueUtilities.keySet()
+                                .equals(new HashSet<>(discvalueset.getValues())))
+                        return "The values in the set " + valueset
+                                        + " do not match the values mapped to utilities "
                                         + valueUtilities.keySet();
                 return null;
@@ -79 +85 @@
         @Override
         public String toString() {
-                return "ValueSetUtilities" + valueUtilities;
+                return "DiscreteValueSetUtilities" + valueUtilities;
         }
 
@@ -86 +92 @@
                 final int prime = 31;
                 int result = 1;
-                result = prime * result + ((valueUtilities == null) ? 0 : valueUtilities.hashCode());
+                result = prime * result
+                                + ((valueUtilities == null) ? 0 : valueUtilities.hashCode());
                 return result;
         }

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

@@ -139 +139 @@
         @Override
         public String toString() {
-                return "NumberValUtility(" + lowValue + "->" + lowUtility + ","
+                return "NumberValueSetUtilities(" + lowValue + "->" + lowUtility + ","
                                 + highValue + "->" + highUtility + ")";
         }

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

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -81 +82 @@
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList("ValueSetUtilities\\{\"a\"=0.14\\}",
-                                "ValueSetUtilities\\{\"b\"=0.37\\}",
-                                "ValueSetUtilities\\{\"a\"=0.37\\}",
-                                "ValueSetUtilities\\{\"a\"=0.14, \"b\"=0.37\\}");
+                return Arrays.asList("DiscreteValueSetUtilities\\{\"a\"=0.14\\}",
+                                "DiscreteValueSetUtilities\\{\"b\"=0.37\\}",
+                                "DiscreteValueSetUtilities\\{\"a\"=0.37\\}",
+                                "DiscreteValueSetUtilities\\{\"a\"=0.14, \"b\"=0.37\\}");
         }
 
@@ -200 +201 @@
 
         }
+
+        @Test
+        public void testDeserializeAsDiscrete()
+                        throws JsonParseException, JsonMappingException, IOException {
+                // Check that DiscreteValueSetUtilities properly deserializes
+                // discreteutils.
+                String utilstring = "{\"discreteutils\": {\"valueUtilities\": {\"Party Tent\": 0.52,\"Your Dorm\": 0.23,\"Party Room\": 0.99,\"Ballroom\": 0.77}}}";
+                DiscreteValueSetUtilities valueutils = jackson.readValue(utilstring,
+                                DiscreteValueSetUtilities.class);
+                assertTrue(new BigDecimal("0.23").compareTo(
+                                valueutils.getUtility(new DiscreteValue("Your Dorm"))) == 0);
+
+        }
+
 }

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

@@ -20 +20 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 
 import geniusweb.issuevalue.Bid;
@@ -145 +144 @@
         public List<String> getGeneralTestStrings() {
                 return Arrays.asList(
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.7, issue1=0.3\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value1\"\\}\\]");
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.7, issue1=0.3\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value1\"\\}\\]");
         }
 
@@ -271 +270 @@
         }
 
-        @Test(expected = InvalidDefinitionException.class)
+        @Test
         public void loadFullWithJson() throws IOException {
                 String profile = new String(

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

@@ -44 +44 @@
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList("NumberValUtility\\(12.5->0.5,18.5->0.9\\)",
-                                "NumberValUtility\\(12.5->0.6,18.5->0.9\\)",
-                                "NumberValUtility\\(12.5->0.5,18.4->0.9\\)");
+                return Arrays.asList("NumberValueSetUtilities\\(12.5->0.5,18.5->0.9\\)",
+                                "NumberValueSetUtilities\\(12.5->0.6,18.5->0.9\\)",
+                                "NumberValueSetUtilities\\(12.5->0.5,18.4->0.9\\)");
         }
 

profile/src/test/resources/party1.json

@@ -92 +92 @@
                                 "Location": {
                                         "values": [
-                                                "Party Tent'",
+                                                "Party Tent",
                                                 "Your Dorm",
                                                 "Party Room",