Changeset 7

Timestamp:

09/25/19 16:49:06 (5 years ago)

Author:

bart

Message:

Fix consistency check LinearAdditiveUtilitySpace

Files:

• party/src/test/java/geniusweb/party/inform/NegotiationInfoTest.java (modified) (5 diffs)
• profile/src/main/java/geniusweb/profile/utilityspace/LinearAdditiveUtilitySpace.java (modified) (2 diffs)
• profile/src/test/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilitiesTest.java (modified) (4 diffs)
• profile/src/test/java/geniusweb/profile/utilityspace/LinearAdditiveSerializationTest.java (modified) (6 diffs)
• profile/src/test/java/geniusweb/profile/utilityspace/LinearAdditiveTest.java (modified) (5 diffs)
• profile/src/test/resources (added)
• profile/src/test/resources/party1.json (added)

party/src/test/java/geniusweb/party/inform/NegotiationInfoTest.java

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Before;
@@ -43 +45 @@
         private Settings negoinfo4;
         private final Date date = new Date(999);
+        private final static ObjectMapper jackson = new ObjectMapper();
 
         @Before
@@ -48 +51 @@
                         JsonMappingException, IOException {
                 // we can't mock because we want to test the serializer
-                ObjectMapper jackson = new ObjectMapper();
                 ProfileRef profile1 = new ProfileRef(new URI("ws:profile1"));
                 // jackson.readValue(serialized, Profile.class);
@@ -98 +100 @@
         @Test
         public void testSerialize() throws JsonProcessingException {
-                ObjectMapper jackson = new ObjectMapper();
 
                 String json = jackson.writeValueAsString(negoinfo1);
@@ -108 +109 @@
         public void testDeserialize()
                         throws JsonParseException, JsonMappingException, IOException {
-                ObjectMapper jackson = new ObjectMapper();
                 Settings p = (Settings) jackson.readValue(asJson, Inform.class);
                 System.out.println(p);
                 assertEquals(negoinfo1, p);
         }
+        
+        @Test
+        public void testGeneralDict() throws JsonParseException, JsonMappingException, IOException {
+                Map val = jackson.readValue("{\"a\":1,\"b\":{\"x\":3},\"c\":[1,2,3]}", HashMap.class);
+                System.out.println(val);
+        }
 
 }

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

@@ -67 +67 @@
                         @JsonProperty("issueWeights") Map<String, BigDecimal> weights,
                         @JsonProperty("reservationBid") Bid resBid) {
+                this.domain = domain;
+                this.name = name;
+                this.reservationBid = resBid;
+                this.issueUtilities.putAll(utils);
+                this.issueWeights.putAll(weights);
+
                 if (domain == null) {
                         throw new NullPointerException("domain=null");
@@ -116 +122 @@
                                         + weights.values() + ") must be 1");
                 }
-                this.domain = domain;
-                this.name = name;
-                this.reservationBid = resBid;
-                issueUtilities.putAll(utils);
-                issueWeights.putAll(weights);
         }
 

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

@@ -2 +2 @@
 
 import static org.junit.Assert.assertEquals;
-
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Arrays;
@@ -10 +12 @@
 
 import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import geniusweb.issuevalue.DiscreteValue;
@@ -35 +41 @@
         private final static DiscreteValueSetUtilities utils, utils1, utilsb,
                         utils1b, utilsc1, utilsc2;
+        private static final ObjectMapper jackson = new ObjectMapper();
 
         static {
@@ -179 +186 @@
 
         }
+
+        @Test
+        public void testIsFittingWrongIssues()
+                        throws JsonParseException, JsonMappingException, IOException {
+                // Notice, party tent has extra single quote in the valuesstr.
+                String valuesstr = "{\"values\": [\"Party Tent'\",\"Your Dorm\", \"Party Room\", \"Ballroom\" ]}";
+                String utilstring = "{\"discreteutils\": {\"valueUtilities\": {\"Party Tent\": 0.52,\"Your Dorm\": 0.23,\"Party Room\": 0.99,\"Ballroom\": 0.77}}}";
+                ValueSetUtilities valueutils = jackson.readValue(utilstring,
+                                ValueSetUtilities.class);
+                ValueSet values = jackson.readValue(valuesstr, ValueSet.class);
+                System.out.println(valueutils.isFitting(values));
+                assertFalse(valueutils.isFitting(values).isEmpty());
+
+        }
 }

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

@@ -20 +20 @@
 import geniusweb.issuevalue.DiscreteValueSet;
 import geniusweb.issuevalue.Domain;
+import geniusweb.issuevalue.NumberValue;
+import geniusweb.issuevalue.NumberValueSet;
 import geniusweb.issuevalue.Value;
 import geniusweb.issuevalue.ValueSet;
 import geniusweb.profile.Profile;
-import geniusweb.profile.utilityspace.DiscreteValueSetUtilities;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
-import geniusweb.profile.utilityspace.NumberValueSetUtilities;
-import geniusweb.profile.utilityspace.ValueSetUtilities;
 
 public class LinearAdditiveSerializationTest {
@@ -39 +37 @@
         private DiscreteValue i1v1 = new DiscreteValue("issue1value1");
         private DiscreteValue i1v2 = new DiscreteValue("issue1value2");
-        private DiscreteValue i2v1 = new DiscreteValue("issue2value1");
-        private DiscreteValue i2v2 = new DiscreteValue("issue2value2");
+        private NumberValue i2v1 = new NumberValue("0.36");
+        private NumberValue i2v2 = new NumberValue("0.71");
         private Domain domain;
 
@@ -47 +45 @@
         private BigDecimal TWELVE = new BigDecimal("12");
         private BigDecimal EIGHTEEN = new BigDecimal("18");
+        private static final ObjectMapper jackson = new ObjectMapper();
 
         private LinearAdditiveUtilitySpace space;
-        private String serialized = "{\"LinearAdditiveUtilitySpace\":{"
-                        + "\"domain\":{\"name\":\"test\","
-                        + "\"issuesValues\":{\"issue2\":{\"values\":[\"issue2value1\",\"issue2value2\"]},"
-                        + "\"issue1\":{\"values\":[\"issue1value1\",\"issue1value2\"]}}},"
-                        + "\"name\":\"testprofile\"," + "\"issueUtilities\":"
-                        + "{\"issue2\":{\"numberutils\":{\"lowValue\":12,\"lowUtility\":0.3,\"highValue\":18,\"highUtility\":0.6}},"
-                        + "\"issue1\":{\"discreteutils\":{\"valueUtilities\":{\"issue1value1\":0.2,\"issue1value2\":0.3}}}},"
-                        + "\"issueWeights\":{\"issue2\":0.4,\"issue1\":0.6},"
-                        + "\"reservationBid\":{\"issuevalues\":{\"issue2\":\"issue2value1\",\"issue1\":\"issue1value2\"}}"
-                        + "}" + "}";
+
+        private String serialized = "{\"LinearAdditiveUtilitySpace\":{\"domain\":{\"name\":\"test\",\"issuesValues\":{\"issue2\":{\"range\":[12,18,1]},\"issue1\":{\"values\":[\"issue1value1\",\"issue1value2\"]}}},\"name\":\"testprofile\",\"issueUtilities\":{\"issue2\":{\"numberutils\":{\"lowValue\":12,\"lowUtility\":0.3,\"highValue\":18,\"highUtility\":0.6}},\"issue1\":{\"discreteutils\":{\"valueUtilities\":{\"issue1value1\":0.2,\"issue1value2\":0.3}}}},\"issueWeights\":{\"issue2\":0.4,\"issue1\":0.6},\"reservationBid\":{\"issuevalues\":{\"issue2\":0.36,\"issue1\":\"issue1value2\"}}}}";
 
         private String jobsjson = "{\"LinearAdditiveUtilitySpace\":{\"issueUtilities\":{"
@@ -96 +87 @@
                 Map<String, ValueSet> values = new HashMap<>();
                 values.put(ISS1, new DiscreteValueSet(Arrays.asList(i1v1, i1v2)));
-                values.put(ISS2, new DiscreteValueSet(Arrays.asList(i2v1, i2v2)));
+                values.put(ISS2, new NumberValueSet(TWELVE, EIGHTEEN, BigDecimal.ONE));
                 domain = new Domain("test", values);
 
@@ -135 +126 @@
         @Test
         public void testDeserializeFromValue() throws IOException {
-                ObjectMapper jackson = new ObjectMapper();
                 assertEquals(space, jackson.readValue(serialized, Profile.class));
         }
@@ -141 +131 @@
         @Test
         public void testDeserializeJobs() throws IOException {
-                ObjectMapper jackson = new ObjectMapper();
                 Profile jobs = jackson.readValue(jobsjson, Profile.class);
         }

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

@@ -6 +6 @@
 import static org.mockito.Mockito.when;
 
+import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -14 +18 @@
 
 import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 
 import geniusweb.issuevalue.Bid;
@@ -21 +28 @@
 import geniusweb.issuevalue.Value;
 import geniusweb.issuevalue.ValueSet;
-import geniusweb.profile.utilityspace.DiscreteValueSetUtilities;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
-import geniusweb.profile.utilityspace.ValueSetUtilities;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -54 +58 @@
 
         private static final ValueSetUtilities value1Utils;
+        private static final ObjectMapper jackson = new ObjectMapper();
 
         static {
@@ -265 +270 @@
                                 WEIGHT1.multiply(I1V1UTIL).compareTo(space.getUtility(bid)));
         }
+
+        @Test(expected = InvalidDefinitionException.class)
+        public void loadFullWithJson() throws IOException {
+                String profile = new String(
+                                Files.readAllBytes(Paths.get("src/test/resources/party1.json")),
+                                StandardCharsets.UTF_8);
+                UtilitySpace space = jackson.readValue(profile, UtilitySpace.class);
+
+        }
 }