Changes in / [3:1]

Files:

• bidspace/pom.xml (modified) (1 diff)
• bidspace/src/main/java/geniusweb/bidspace/BidsWithUtility.java (deleted)
• bidspace/src/main/java/geniusweb/bidspace/PartialSpaceFromUtility.java (deleted)
• bidspace/src/test/java/geniusweb/bidspace/BidsWithUtilityTest.java (deleted)
• bidspace/src/test/java/geniusweb/bidspace/PartialSpaceFromUtilityTest.java (deleted)
• exampleparties/boulware (deleted)
• exampleparties/conceder (deleted)
• exampleparties/hardliner (deleted)
• exampleparties/linear (deleted)
• exampleparties/pom.xml (modified) (1 diff)
• exampleparties/randomparty/pom.xml (modified) (1 diff)
• exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java (modified) (5 diffs)
• exampleparties/randompartypy/pom.xml (modified) (1 diff)
• exampleparties/randompartypy/src/main/resources/RandomParty.py (modified) (3 diffs)
• exampleparties/timedependentparty (deleted)
• issuevalue/pom.xml (modified) (1 diff)
• issuevalue/src/test/java/geniusweb/issuevalue/DomainTest.java (modified) (8 diffs)
• issuevalue/src/test/java/geniusweb/issuevalue/NumberValueSetTest.java (modified) (2 diffs)
• profile/src/main/java/geniusweb/profile/DefaultPartialOrdering.java (deleted)
• profile/src/main/java/geniusweb/profile/DefaultProfile.java (deleted)
• profile/src/main/java/geniusweb/profile/Profile.java (modified) (2 diffs)
• profile/src/main/java/geniusweb/profile/utilityspace/NumberValueSetUtilities.java (modified) (3 diffs)
• profile/src/test/java/geniusweb/profile/DefaultPartialOrderingTest.java (deleted)
• profile/src/test/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilitiesTest.java (modified) (6 diffs)
• profile/src/test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java (modified) (3 diffs)
• profileconnection/src/main/java/geniusweb/profileconnection/FileProfileConnector.java (modified) (3 diffs)
• protocol/pom.xml (modified) (1 diff)
• simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerE2ETest.java (modified) (3 diffs)
• simplerunner/src/test/resources/jobs/jobs1partial.json (deleted)
• simplerunner/src/test/resources/settings2.json (deleted)

/bidspace/pom.xml

@@ -42 +42 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>immutablelist</artifactId>
-                        <version>1.0.1</version>
+                        <version>1.0.0</version>
                 </dependency>
 

/exampleparties/pom.xml

@@ -18 +18 @@
                 <module>randomparty</module>
                 <module>randompartypy</module>
-                <module>timedependentparty</module>
-                <module>conceder</module>
-                <module>hardliner</module>
-                <module>boulware</module>
-                <module>linear</module>
         </modules>
 </project>

/exampleparties/randomparty/pom.xml

@@ -54 +54 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>immutablelist</artifactId>
-                        <version>1.0.1</version>
+                        <version>1.0.0</version>
                 </dependency>
 

/exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java

@@ -23 +23 @@
 import geniusweb.party.inform.Settings;
 import geniusweb.party.inform.YourTurn;
-import geniusweb.profile.PartialOrdering;
-import geniusweb.profile.Profile;
 import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
 import geniusweb.profileconnection.ProfileConnectionFactory;
@@ -57 +55 @@
                         if (info instanceof Settings) {
                                 Settings settings = (Settings) info;
-                                this.profileint = ProfileConnectionFactory.create(settings.getProfile().getURI(), getReporter());
+                                this.profileint = ProfileConnectionFactory
+                                                .create(settings.getProfile().getURI(), getReporter());
                                 this.me = settings.getID();
                                 this.progress = settings.getProgress();
@@ -81 +80 @@
         public Capabilities getCapabilities() {
                 try {
-                        return new Capabilities(new HashSet<>(Arrays.asList(new ProtocolRef(new URI("SAOP")))));
+                        return new Capabilities(new HashSet<>(
+                                        Arrays.asList(new ProtocolRef(new URI("SAOP")))));
                 } catch (URISyntaxException e) {
-                        getReporter().log(Level.SEVERE, "Failed to create capabilities URI", e);
+                        getReporter().log(Level.SEVERE, "Failed to create capabilities URI",
+                                        e);
                         return null;
                 }
@@ -99 +100 @@
                 } else {
                         // for demo. Obviously full bids have higher util in general
-                        AllPartialBidsList bidspace = new AllPartialBidsList(profileint.getProfile().getDomain());
+                        AllPartialBidsList bidspace = new AllPartialBidsList(
+                                        profileint.getProfile().getDomain());
                         Bid bid = null;
                         for (int attempt = 0; attempt < 20 && !isGood(bid); attempt++) {
@@ -112 +114 @@
 
         private boolean isGood(Bid bid) {
-                if (bid == null)
-                        return false;
-                Profile profile = profileint.getProfile();
-                if (profile instanceof LinearAdditiveUtilitySpace) {
-                        return ((LinearAdditiveUtilitySpace) profile).getUtility(bid).doubleValue() > 0.6;
-                }
-                if (profile instanceof PartialOrdering) {
-                        return ((PartialOrdering) profile).isPreferredOrEqual(bid, profile.getReservationBid());
-                }
-                throw new IllegalArgumentException("Can not handle profile type " + profile.getClass());
+                return bid != null
+                                && ((LinearAdditiveUtilitySpace) profileint.getProfile())
+                                                .getUtility(bid).doubleValue() > 0.6;
         }
 

/exampleparties/randompartypy/pom.xml

@@ -47 +47 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>immutablelist</artifactId>
-                        <version>1.0.1</version>
+                        <version>1.0.0</version>
                 </dependency>
 

/exampleparties/randompartypy/src/main/resources/RandomParty.py

@@ -23 +23 @@
 import geniusweb.party.DefaultParty as DefaultParty
 import geniusweb.profile.Profile as Profile
-import geniusweb.profile.PartialOrdering as PartialOrdering
 import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace as LinearAdditiveUtilitySpace
 import geniusweb.references.ProfileRef as ProfileRef
@@ -30 +29 @@
 import geniusweb.profileconnection.ProfileInterface as ProfileInterface
 import geniusweb.progress.ProgressRounds as ProgressRounds
-
 
 import com.fasterxml.jackson.databind.ObjectMapper as ObjectMapper
@@ -94 +92 @@
 
         def _isGood(self, bid):
-                if bid == None:
-                        return false
-                profile = self.profile.getProfile()
-                if isinstance(profile, LinearAdditiveUtilitySpace):
-                        return profile.getUtility(bid).doubleValue() > 0.6;
-                if isinstance(profile, PartialOrdering):
-                        return profile.isPreferredOrEqual(bid, profile.getReservationBid())
-                raise Exception("Can not handle this type of profile")
+                return bid != None and self.profile.getProfile().getUtility(bid).doubleValue() > 0.6;

/issuevalue/pom.xml

@@ -92 +92 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>immutablelist</artifactId>
-                        <version>1.0.1</version>
+                        <version>1.0.0</version>
                 </dependency>
 

/issuevalue/src/test/java/geniusweb/issuevalue/DomainTest.java

@@ -21 +21 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import geniusweb.issuevalue.Bid;
+import geniusweb.issuevalue.DiscreteValue;
+import geniusweb.issuevalue.DiscreteValueSet;
+import geniusweb.issuevalue.Domain;
+import geniusweb.issuevalue.NumberValue;
+import geniusweb.issuevalue.NumberValueSet;
+import geniusweb.issuevalue.ValueSet;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -31 +38 @@
         private static final String ISSUE3 = "issue3";
         private static final ObjectMapper jackson = new ObjectMapper();
-        private static final String domainstring = "{\"name\":\"testdomain\",\"issuesValues\":{\"issue2\":{\"range\":[2,3,0.22]},\"issue1\":{\"values\":[\"i1v1\",\"i1v2\"]}}}";
+        private static final String domainstring = "{\"name\":\"testdomain\",\"issuesValues\":{\"issue2\":{\"range\":[\"2\",\"3\",\"0.22\"]},\"issue1\":{\"values\":[\"i1v1\",\"i1v2\"]}}}";
 
-        private static final String jobsstring = "{\"name\":\"jobs\"," + "\"issuesValues\":{"
-                        + "\"lease car\":{\"values\":[\"yes\",\"no\"]}," + "\"permanent contract\":{\"values\":[\"yes\",\"no\"]},"
+        private static final String jobsstring = "{\"name\":\"jobs\","
+                        + "\"issuesValues\":{"
+                        + "\"lease car\":{\"values\":[\"yes\",\"no\"]},"
+                        + "\"permanent contract\":{\"values\":[\"yes\",\"no\"]},"
                         + "\"career development opportunities\":{\"values\":[\"low\",\"medium\",\"high\"]},"
                         + "\"fte\":{\"values\":[\"0.6\",\"0.8\",\"1.0\"]},"
@@ -64 +73 @@
                 Map<String, ValueSet> issues1 = new HashMap<>();
                 issues1.put(ISSUE1, values1);
-                issues1.put(ISSUE2, new NumberValueSet(BigDecimal.ONE, TWO, new BigDecimal("0.22")));
+                issues1.put(ISSUE2, new NumberValueSet(BigDecimal.ONE, TWO,
+                                new BigDecimal("0.22")));
                 domain3 = new Domain(DOMAINNAME, issues1);
 
@@ -71 +81 @@
         @Override
         public List<List<Domain>> getGeneralTestData() {
-                return Arrays.asList(Arrays.asList(domain, domain1), Arrays.asList(domain2), Arrays.asList(domain3));
+                return Arrays.asList(Arrays.asList(domain, domain1),
+                                Arrays.asList(domain2), Arrays.asList(domain3));
         }
 
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList("Domain.*testdomain.*", "Domain.*testdomain1.*", "Domain.*testdomain.*");
+                return Arrays.asList("Domain.*testdomain.*", "Domain.*testdomain1.*",
+                                "Domain.*testdomain.*");
         }
 
@@ -97 +109 @@
                 System.out.println(jobsstring);
                 Domain jobsdomain = jackson.readValue(jobsstring, Domain.class);
-                assertEquals(new HashSet<>(Arrays.asList("lease car", "permanent contract", "career development opportunities",
-                                "fte", "salary", "work from home")), jobsdomain.getIssues());
+                assertEquals(new HashSet<>(Arrays.asList("lease car",
+                                "permanent contract", "career development opportunities", "fte",
+                                "salary", "work from home")), jobsdomain.getIssues());
 
         }
@@ -121 +134 @@
         public void testIsCompleteNoIssuesDefined() {
                 Bid bid = mock(Bid.class);
-                assertThat(domain.isComplete(bid), new PatternMatch("Issues in bid .* do not match issues in domain .*"));
+                assertThat(domain.isComplete(bid), new PatternMatch(
+                                "Issues in bid .* do not match issues in domain .*"));
         }
 
@@ -140 +154 @@
                 // THREE is NOT a possible value in the NumberValueSet.
                 when(bid.getValue(ISSUE2)).thenReturn(new NumberValue(THREE));
-                assertThat(domain.isComplete(bid), new PatternMatch("bid issue issue2 has illegal value 3"));
+                assertThat(domain.isComplete(bid),
+                                new PatternMatch("bid issue issue2 has illegal value 3"));
         }
 
@@ -152 +167 @@
                 // THREE is NOT a possible value in the NumberValueSet.
                 when(bid.getValue(ISSUE2)).thenReturn(new NumberValue(THREE));
-                assertThat(domain.isComplete(bid), new PatternMatch("Issues in bid .* do not match issues in domain .*"));
+                assertThat(domain.isComplete(bid), new PatternMatch(
+                                "Issues in bid .* do not match issues in domain .*"));
         }
 

/issuevalue/src/test/java/geniusweb/issuevalue/NumberValueSetTest.java

@@ -16 +16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import geniusweb.issuevalue.NumberValue;
+import geniusweb.issuevalue.NumberValueSet;
+import geniusweb.issuevalue.ValueSet;
 import tudelft.utilities.immutablelist.Range;
 
@@ -30 +33 @@
                         new BigDecimal("0.1"));
 
-        private final String asString = "{\"range\":[12.2,12.6,0.3]}";
+        private final String asString = "{\"range\":[\"12.2\",\"12.6\",\"0.3\"]}";
         private final static NumberValueSet bigset = new NumberValueSet(BigDecimal.ZERO, BigDecimal.TEN,
                         new BigDecimal("0.00003"));

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

@@ -16 +16 @@
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.WRAPPER_OBJECT)
-@JsonSubTypes({ @JsonSubTypes.Type(value = LinearAdditiveUtilitySpace.class),
-                @JsonSubTypes.Type(value = DefaultPartialOrdering.class) })
+@JsonSubTypes({ @JsonSubTypes.Type(value = LinearAdditiveUtilitySpace.class) })
 public interface Profile {
 
@@ -33 +32 @@
         /**
          * 
-         * @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/NumberValueSetUtilities.java

@@ -6 +6 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 
 import geniusweb.issuevalue.NumberValue;
@@ -14 +11 @@
 import geniusweb.issuevalue.Value;
 import geniusweb.issuevalue.ValueSet;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
 import tudelft.utilities.immutablelist.Range;
 
@@ -98 +100 @@
                 }
                 if (numvalset.getRange().getHigh().compareTo(highValue) != 0) {
-                        return "the utilities are specified up to " + highValue
-                                        + " but the valueset ends at "
+                        return "the utilities are specified down to " + highValue
+                                        + " but the valueset starts at "
                                         + numvalset.getRange().getHigh();
                 }

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

@@ -1 +1 @@
 package geniusweb.profile.utilityspace;
-
-import static org.junit.Assert.assertEquals;
 
 import java.math.BigDecimal;
@@ -12 +10 @@
 
 import geniusweb.issuevalue.DiscreteValue;
-import geniusweb.issuevalue.DiscreteValueSet;
-import geniusweb.issuevalue.NumberValue;
-import geniusweb.issuevalue.NumberValueSet;
-import geniusweb.issuevalue.ValueSet;
+import geniusweb.profile.utilityspace.DiscreteValueSetUtilities;
 import tudelft.utilities.junit.GeneralTests;
 
-public class DiscreteValueSetUtilitiesTest
-                extends GeneralTests<DiscreteValueSetUtilities> {
+public class DiscreteValueSetUtilitiesTest extends GeneralTests<DiscreteValueSetUtilities> {
 
         private final static DiscreteValue vala = new DiscreteValue("a");
         private final static DiscreteValue vala1 = new DiscreteValue("a");
         private final static DiscreteValue valb = new DiscreteValue("b");
-        private final static NumberValue valn = new NumberValue("99");
 
         private final static BigDecimal util = new BigDecimal("0.14");
@@ -30 +23 @@
         private final static BigDecimal utilb = new BigDecimal("0.37");
 
-        private final static BigDecimal badutil = new BigDecimal("1.37");
-        private final static BigDecimal badutil2 = new BigDecimal("-0.37");
-
-        private final static DiscreteValueSetUtilities utils, utils1, utilsb,
-                        utils1b, utilsc1, utilsc2;
+        private final static DiscreteValueSetUtilities utils, utils1, utilsb, utils1b, utilsc1, utilsc2;
 
         static {
@@ -67 +56 @@
         @Override
         public List<List<DiscreteValueSetUtilities>> getGeneralTestData() {
-                return Arrays.asList(Arrays.asList(utils, utils1),
-                                Arrays.asList(utilsb), Arrays.asList(utils1b),
+                return Arrays.asList(Arrays.asList(utils, utils1), Arrays.asList(utilsb), Arrays.asList(utils1b),
                                 Arrays.asList(utilsc1, utilsc2));
         }
@@ -74 +62 @@
         @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("ValueSetUtilities\\{\"a\"=0.14\\}", "ValueSetUtilities\\{\"b\"=0.37\\}",
+                                "ValueSetUtilities\\{\"a\"=0.37\\}", "ValueSetUtilities\\{\"a\"=0.14, \"b\"=0.37\\}");
         }
 
@@ -86 +72 @@
         }
 
-        @Test(expected = IllegalArgumentException.class)
-        public void testTooLargeUtility() {
-                Map<DiscreteValue, BigDecimal> valueUtils = new HashMap<>();
-                valueUtils.put(vala, util);
-                valueUtils.put(valb, badutil);
-                new DiscreteValueSetUtilities(valueUtils);
-        }
-
-        @Test(expected = IllegalArgumentException.class)
-        public void testNegativeUtility() {
-                Map<DiscreteValue, BigDecimal> valueUtils = new HashMap<>();
-                valueUtils.put(vala, util);
-                valueUtils.put(valb, badutil2);
-                new DiscreteValueSetUtilities(valueUtils);
-        }
-
-        @Test(expected = IllegalArgumentException.class)
-        public void testNullUtility() {
-                Map<DiscreteValue, BigDecimal> valueUtils = new HashMap<>();
-                valueUtils.put(vala, null);
-                valueUtils.put(valb, util);
-                new DiscreteValueSetUtilities(valueUtils);
-        }
-
-        @Test(expected = NullPointerException.class)
-        public void testNullValueUtils() {
-                new DiscreteValueSetUtilities(null);
-
-        }
-
-        @Test(expected = NullPointerException.class)
-        public void testNullIssue() {
-                Map<DiscreteValue, BigDecimal> valueUtils = new HashMap<>();
-                valueUtils.put(vala, util);
-                valueUtils.put(null, utilb);
-                new DiscreteValueSetUtilities(valueUtils);
-        }
-
-        @Test
-        public void testGetUtility() {
-                Map<DiscreteValue, BigDecimal> valueUtils = new HashMap<>();
-                valueUtils.put(vala, util);
-                valueUtils.put(valb, utilb);
-                DiscreteValueSetUtilities utilset = new DiscreteValueSetUtilities(
-                                valueUtils);
-                assertEquals(util, utilset.getUtility(vala));
-                assertEquals(utilb, utilset.getUtility(valb));
-                assertEquals(BigDecimal.ZERO,
-                                utilset.getUtility(new DiscreteValue("unknownIssue")));
-
-        }
-
-        @Test
-        public void testIsFitting() {
-                ValueSet valueset = new DiscreteValueSet(Arrays.asList(vala, valb));
-
-                Map<DiscreteValue, BigDecimal> valueUtils = new HashMap<>();
-                valueUtils.put(vala, util);
-                DiscreteValueSetUtilities utilset = new DiscreteValueSetUtilities(
-                                valueUtils);
-
-                assertEquals(
-                                "The values in the set DiscreteValueSet[\"a\", \"b\"] do not match the values mapped to utilities [\"a\"]",
-                                utilset.isFitting(valueset));
-
-                valueUtils.put(valb, utilb);
-                utilset = new DiscreteValueSetUtilities(valueUtils);
-                assertEquals(null, utilset.isFitting(valueset));
-
-                valueUtils.put(new DiscreteValue("unknownIssue"), util1);
-                utilset = new DiscreteValueSetUtilities(valueUtils);
-                assertEquals(
-                                "The values in the set DiscreteValueSet[\"a\", \"b\"] do not match the values mapped to utilities [\"a\", \"b\", \"unknownIssue\"]",
-                                utilset.isFitting(valueset));
-
-        }
-
-        @Test
-        public void testIsFittingWrongType() {
-                ValueSet valueset = new NumberValueSet(BigDecimal.ZERO, BigDecimal.ONE,
-                                new BigDecimal("0.3"));
-
-                Map<DiscreteValue, BigDecimal> valueUtils = new HashMap<>();
-                valueUtils.put(vala, util);
-                valueUtils.put(valb, utilb);
-                DiscreteValueSetUtilities utilset = new DiscreteValueSetUtilities(
-                                valueUtils);
-
-                assertEquals(
-                                "The utilities are for a discrete valueset but the given values are numberValueSet[0,1,0.3]",
-                                utilset.isFitting(valueset));
-
-        }
 }

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

@@ -9 +9 @@
 import org.junit.Test;
 
-import geniusweb.issuevalue.DiscreteValue;
-import geniusweb.issuevalue.DiscreteValueSet;
 import geniusweb.issuevalue.NumberValue;
-import geniusweb.issuevalue.NumberValueSet;
-import geniusweb.issuevalue.ValueSet;
-import tudelft.utilities.immutablelist.Range;
+import geniusweb.profile.utilityspace.NumberValueSetUtilities;
 import tudelft.utilities.junit.GeneralTests;
 
-public class NumberValueSetUtilTest
-                extends GeneralTests<NumberValueSetUtilities> {
+public class NumberValueSetUtilTest extends GeneralTests<NumberValueSetUtilities> {
 
         private static final BigDecimal lowval1 = new BigDecimal("12.5");
@@ -26 +21 @@
         private static final BigDecimal highvalb = new BigDecimal("18.4");
         private static final BigDecimal highutil = new BigDecimal("0.9");
-        private static final NumberValueSetUtilities valueset1 = new NumberValueSetUtilities(
-                        lowval1, low1util, highval, highutil);
-        private static final NumberValueSetUtilities valueset1b = new NumberValueSetUtilities(
-                        lowval1, low1util, highval, highutil);
-        private static final NumberValueSetUtilities valueset2 = new NumberValueSetUtilities(
-                        lowval1, low1utilb, highval, highutil);
-        private static final NumberValueSetUtilities valueset3 = new NumberValueSetUtilities(
-                        lowval1, low1util, highvalb, highutil);
-        private static final BigDecimal ZERO_1 = new BigDecimal("0.1");
+        private static final NumberValueSetUtilities valueset1 = new NumberValueSetUtilities(lowval1, low1util, highval,
+                        highutil);
+        private static final NumberValueSetUtilities valueset1b = new NumberValueSetUtilities(lowval1, low1util, highval,
+                        highutil);
+        private static final NumberValueSetUtilities valueset2 = new NumberValueSetUtilities(lowval1, low1utilb, highval,
+                        highutil);
+        private static final NumberValueSetUtilities valueset3 = new NumberValueSetUtilities(lowval1, low1util, highvalb,
+                        highutil);
 
         @Override
         public List<List<NumberValueSetUtilities>> getGeneralTestData() {
-                return Arrays.asList(Arrays.asList(valueset1, valueset1b),
-                                Arrays.asList(valueset2), Arrays.asList(valueset3));
+                return Arrays.asList(Arrays.asList(valueset1, valueset1b), Arrays.asList(valueset2), Arrays.asList(valueset3));
         }
 
         @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\\)",
+                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\\)");
         }
@@ -57 +49 @@
         public void utilAscentingTest() {
                 NumberValueSetUtilities utils = valueset1;
-                assertEquals(0,
-                                low1util.compareTo(utils.getUtility(new NumberValue(lowval1))));
+                assertEquals(0, low1util.compareTo(utils.getUtility(new NumberValue(lowval1))));
         }
 
         @Test
         public void utilDescendingTest() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1,
-                                highutil, highval, low1util);
-                assertEquals(0,
-                                highutil.compareTo(utils.getUtility(new NumberValue(lowval1))));
+                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1, highutil, highval, low1util);
+                assertEquals(0, highutil.compareTo(utils.getUtility(new NumberValue(lowval1))));
         }
 
         @Test(expected = IllegalArgumentException.class)
         public void reverserangetest() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(highval,
-                                low1util, highval, highutil);
-        }
-
-        @Test(expected = NullPointerException.class)
-        public void testNullHigh() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1,
-                                low1util, null, highutil);
-        }
-
-        @Test(expected = NullPointerException.class)
-        public void testNullHighUtil() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1,
-                                low1util, highval, null);
-        }
-
-        @Test(expected = NullPointerException.class)
-        public void testNullLow() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(null,
-                                low1util, highval, highutil);
-        }
-
-        @Test(expected = NullPointerException.class)
-        public void testNullLowUtil() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1,
-                                null, highval, highutil);
-        }
-
-        @Test(expected = IllegalArgumentException.class)
-        public void testLowUtilNegative() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1,
-                                new BigDecimal("-0.2"), highval, highutil);
-        }
-
-        @Test(expected = IllegalArgumentException.class)
-        public void testHighUtilNegative() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1,
-                                low1util, highval, new BigDecimal("-0.000003"));
-        }
-
-        @Test
-        public void getUtilTest() {
-                NumberValueSetUtilities utils = new NumberValueSetUtilities(lowval1,
-                                low1util, highval, highutil);
-                assertEquals(0,
-                                highutil.compareTo(utils.getUtility(new NumberValue(highval))));
-                assertEquals(0,
-                                low1util.compareTo(utils.getUtility(new NumberValue(lowval1))));
-                // linear interpolated , check center
-                BigDecimal middleutil = low1util.add(highutil)
-                                .divide(new BigDecimal("2"));
-                NumberValue middleval = new NumberValue(
-                                lowval1.add(highval).divide(new BigDecimal("2")));
-                assertEquals(0, middleutil.compareTo(utils.getUtility(middleval)));
-
-        }
-
-        @Test
-        public void testIsNotFittingRange() {
-                ValueSet valueset = new NumberValueSet(
-                                new Range(low1util, highutil, new BigDecimal("0.02")));
-                ValueSetUtilities utilset = new NumberValueSetUtilities(lowval1,
-                                low1util, highval, highutil);
-                assertEquals(
-                                "the utilities are specified down to 12.5 but the valueset starts at 0.5",
-                                utilset.isFitting(valueset));
-        }
-
-        @Test
-        public void testTopOfRangeTooLarge() {
-                ValueSet valueset = new NumberValueSet(
-                                new Range(lowval1, highval.subtract(ZERO_1), ZERO_1));
-                ValueSetUtilities utilset = new NumberValueSetUtilities(lowval1,
-                                low1util, highval, highutil);
-                assertEquals(
-                                "the utilities are specified up to 18.5 but the valueset ends at 18.4",
-                                utilset.isFitting(valueset));
-        }
-
-        @Test
-        public void testIsFitting() {
-                ValueSet valueset = new NumberValueSet(
-                                new Range(lowval1, highval, BigDecimal.ONE));
-                ValueSetUtilities utilset = new NumberValueSetUtilities(lowval1,
-                                low1util, highval, highutil);
-                assertEquals(null, utilset.isFitting(valueset));
-        }
-
-        @Test
-        public void testIsFittingWrongType() {
-                DiscreteValue vala = new DiscreteValue("a");
-                DiscreteValue valb = new DiscreteValue("b");
-                ValueSet valueset = new DiscreteValueSet(Arrays.asList(vala, valb));
-
-                NumberValueSetUtilities utilset = new NumberValueSetUtilities(lowval1,
-                                low1util, highval, highutil);
-                assertEquals(
-                                "The utilities are for a number valueset but the given values are DiscreteValueSet[\"a\", \"b\"]",
-                                utilset.isFitting(valueset));
-
+                NumberValueSetUtilities utils = new NumberValueSetUtilities(highval, highutil, lowval1, low1util);
         }
 

/profileconnection/src/main/java/geniusweb/profileconnection/FileProfileConnector.java

@@ -10 +10 @@
 
 import geniusweb.profile.Profile;
+import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
 
 /**
@@ -16 +17 @@
 public class FileProfileConnector implements ProfileInterface {
         private final static ObjectMapper jackson = new ObjectMapper();
-        private final Profile profile;
+        private final LinearAdditiveUtilitySpace profile;
 
         /**
@@ -25 +26 @@
         public FileProfileConnector(String filename) throws IOException {
                 Path path = new File(filename).toPath();
-                String serialized = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
-                profile = jackson.readValue(serialized, Profile.class);
+                String serialized = new String(Files.readAllBytes(path),
+                                StandardCharsets.UTF_8);
+                profile = (LinearAdditiveUtilitySpace) jackson.readValue(serialized,
+                                Profile.class);
         }
 
         @Override
-        public Profile getProfile() {
+        public LinearAdditiveUtilitySpace getProfile() {
                 return profile;
         }

/protocol/pom.xml

@@ -56 +56 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>immutablelist</artifactId>
-                        <version>1.0.1</version>
+                        <version>1.0.0</version>
                 </dependency>
                 <dependency>

/simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerE2ETest.java

@@ -5 +5 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collection;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import geniusweb.protocol.session.SessionSettings;
+import geniusweb.simplerunner.ClassPathConnectionFactory;
+import geniusweb.simplerunner.NegoRunner;
 import tudelft.utilities.logging.ReportToLogger;
 import tudelft.utilities.logging.Reporter;
@@ -25 +22 @@
  * this module.
  */
-@RunWith(Parameterized.class)
 public class SessionRunnerE2ETest {
+        private static final String SESSION_SETTINGS = "src/test/resources/settings.json";
         private final ObjectMapper jackson = new ObjectMapper();
         private NegoRunner runner;
         private Reporter logger = new ReportToLogger("test");
-        private String filename;
-
-        @Parameters
-        public static Collection<Object[]> data() {
-                return Arrays.asList(
-                                new Object[][] { { "src/test/resources/settings.json" }, { "src/test/resources/settings2.json" } });
-        }
-
-        public SessionRunnerE2ETest(String file) {
-                this.filename = file;
-        }
 
         @Before
         public void before() throws IOException {
-                String serialized = new String(Files.readAllBytes(Paths.get(filename)), StandardCharsets.UTF_8);
-                SessionSettings settings = jackson.readValue(serialized, SessionSettings.class);
+                String serialized = new String(
+                                Files.readAllBytes(Paths.get(SESSION_SETTINGS)),
+                                StandardCharsets.UTF_8);
+                SessionSettings settings = jackson.readValue(serialized,
+                                SessionSettings.class);
 
-                runner = new NegoRunner(settings, new ClassPathConnectionFactory(), logger);
+                runner = new NegoRunner(settings, new ClassPathConnectionFactory(),
+                                logger);
 
         }
@@ -62 +52 @@
         @Test
         public void runTestMainFunction() throws IOException {
-                NegoRunner.main(new String[] { filename });
+                NegoRunner.main(new String[] { SESSION_SETTINGS });
         }
 }