Changeset 13

Timestamp:

06/11/20 16:34:45 (5 years ago)

Author:

bart

Message:

Update to version 1.41

Files:

• pom.xml (modified) (5 diffs)
• src/main/java/geniusweb/profilesserver/websocket/GetProfileSocket.java (modified) (2 diffs)
• src/main/webapp/domainsrepo/jobs/jobs1.json (modified) (1 diff)
• src/main/webapp/domainsrepo/jobs/jobs2.json (modified) (1 diff)
• src/test/java/geniusweb/clienttest/JavaClientTest.java (modified) (1 diff)

pom.xml

@@ -6 +6 @@
         <artifactId>profilesserver</artifactId>
         <packaging>war</packaging>
-        <version>1.4.0</version>
+        <version>1.4.1</version> <!-- must equal ${geniusweb.version} -->
         <name>profileserver Maven Webapp</name>
         <url>http://maven.apache.org</url>
@@ -18 +18 @@
                 <jackson-2-version>2.9.10</jackson-2-version>
                 <tomcat.version>8.5.20</tomcat.version>
-                <geniusweb.version>1.4.0</geniusweb.version>
+                <geniusweb.version>1.4.1</geniusweb.version>
         </properties>
 
@@ -70 +70 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>tree</artifactId>
-                        <version>1.0.0</version>
+                        <version>1.1.0</version>
                 </dependency>
 
@@ -87 +87 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>files</artifactId>
-                        <version>1.0.0</version>
+                        <version>1.1.0</version>
                 </dependency>
 
@@ -214 +214 @@
 
         <build>
-                <finalName>profilesserver-1.4.0</finalName>
-
-
+                <!-- Don't specify finalName as the war number would mismatch the pom version -->
 
                 <resources>

src/main/java/geniusweb/profilesserver/websocket/GetProfileSocket.java

@@ -48 +48 @@
  * the minimum utility bid is included. The other bids are picked at random.
  * This filtering mechanism only works if the profile is {@link LinearAdditive}
- * space.
+ * space. The reservation bid is passed through unmodified.
  */
 @ServerEndpoint("/websocket/get/{domain}/{profile}")
@@ -97 +97 @@
         }
 
+        /**
+         * 
+         * @param prof1
+         * @return a filtered profile. If "partial" is not set, this returns the
+         *         given profile unmodified. If partial is set, a
+         *         DefaultPartialOrdering with the requested number of bids are
+         *         selected
+         */
         private Profile filter(Profile prof1) {
                 String partial = params.get("partial");

src/main/webapp/domainsrepo/jobs/jobs1.json

@@ -115 +115 @@
                 "reservationBid": {
                         "issuevalues": {
-                                "salary": "300",
+                                "salary": "3500",
                                 "fte": "0.8",
-                                "work from home": "0",
+                                "work from home": "1",
                                 "lease car": "no",
-                                "permanent contract": "no",
+                                "permanent contract": "yes",
                                 "career development opportunities": "medium"
                         }

src/main/webapp/domainsrepo/jobs/jobs2.json

@@ -115 +115 @@
                 "reservationBid": {
                         "issuevalues": {
-                                "salary": "300",
+                                "salary": "3000",
                                 "fte": "0.8",
                                 "work from home": "0",

src/test/java/geniusweb/clienttest/JavaClientTest.java

@@ -28 +28 @@
         private static final String JSON = "\\{\"ws.*/jobs\":\\[\"ws.*/jobs/jobs1\".*\"ws.*/jobs/jobs2\"\\]\\}";
 
-        private static final String JOBS1PROFILE = "{\"LinearAdditiveUtilitySpace\":{"
-                        + "\"domain\":{\"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\"]},\"salary\":{\"values\":[\"2000\",\"2500\",\"3000\",\"3500\",\"4000\"]},\"work from home\":{\"values\":[\"0\",\"1\",\"2\"]}}},"
-                        + "\"name\":\"jobs1\"," + "\"issueUtilities\":{"
-                        + "\"lease car\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},"
-                        + "\"permanent contract\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},"
-                        + "\"career development opportunities\":{\"discreteutils\":{\"valueUtilities\":{\"high\":1,\"low\":0,\"medium\":0.5}}},"
-                        + "\"fte\":{\"discreteutils\":{\"valueUtilities\":{\"1.0\":0.75,\"0.6\":0.25,\"0.8\":0.5}}},"
-                        + "\"salary\":{\"discreteutils\":{\"valueUtilities\":{\"4000\":1.0,\"2500\":0.25,\"3500\":0.75,\"2000\":0,\"3000\":0.3}}},"
-                        + "\"work from home\":{\"discreteutils\":{\"valueUtilities\":{\"1\":0.5,\"2\":0.666666666666,\"0\":0.333333333}}}},"
-                        + "\"issueWeights\":{\"lease car\":0.06,\"permanent contract\":0.16,\"career development opportunities\":0.04,\"fte\":0.32,\"salary\":0.24,\"work from home\":0.18},"
-                        + "\"reservationBid\":{\"issuevalues\":{\"lease car\":\"no\",\"permanent contract\":\"no\",\"career development opportunities\":\"medium\",\"fte\":\"0.8\",\"salary\":\"300\",\"work from home\":\"0\"}}}}";
+        private static final String JOBS1PROFILE = "{\"LinearAdditiveUtilitySpace\":{\"domain\":{\"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\"]},\"salary\":{\"values\":[\"2000\",\"2500\",\"3000\",\"3500\",\"4000\"]},\"work from home\":{\"values\":[\"0\",\"1\",\"2\"]}}},\"name\":\"jobs1\",\"issueUtilities\":{\"lease car\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"permanent contract\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"career development opportunities\":{\"discreteutils\":{\"valueUtilities\":{\"high\":1,\"low\":0,\"medium\":0.5}}},\"fte\":{\"discreteutils\":{\"valueUtilities\":{\"1.0\":0.75,\"0.6\":0.25,\"0.8\":0.5}}},\"salary\":{\"discreteutils\":{\"valueUtilities\":{\"4000\":1.0,\"2500\":0.25,\"3500\":0.75,\"2000\":0,\"3000\":0.3}}},\"work from home\":{\"discreteutils\":{\"valueUtilities\":{\"1\":0.5,\"2\":0.666666666666,\"0\":0.333333333}}}},\"issueWeights\":{\"lease car\":0.06,\"permanent contract\":0.16,\"career development opportunities\":0.04,\"fte\":0.32,\"salary\":0.24,\"work from home\":0.18},\"reservationBid\":{\"issuevalues\":{\"lease car\":\"no\",\"permanent contract\":\"yes\",\"career development opportunities\":\"medium\",\"fte\":\"0.8\",\"salary\":\"3500\",\"work from home\":\"1\"}}}}";
+
         private static EmbeddedTomcat tomcat = new EmbeddedTomcat();