Changeset 18

Timestamp:

09/22/20 08:52:39 (4 years ago)

Author:

bart

Message:

Version 1.5.

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/geniusweb/partiesserver/repository/RunningParty.java (modified) (1 diff)
• src/main/java/geniusweb/partiesserver/websocket/PartySocket.java (modified) (1 diff)
• src/main/webapp/partiesrepo/agentgg-1.5.0.jar (added)
• src/main/webapp/partiesrepo/boa-1.5.0.jar (added)
• src/main/webapp/partiesrepo/boulware-1.5.0.jar (added)
• src/main/webapp/partiesrepo/comparebids-1.5.0.jar (added)
• src/main/webapp/partiesrepo/conceder-1.5.0.jar (added)
• src/main/webapp/partiesrepo/hardliner-1.5.0.jar (added)
• src/main/webapp/partiesrepo/linear-1.5.0.jar (added)
• src/main/webapp/partiesrepo/randomparty-1.5.0.jar (added)
• src/main/webapp/partiesrepo/randompyparty-1.5.0.jar (added)
• src/main/webapp/partiesrepo/simpleshaop-1.5.0.jar (added)
• src/main/webapp/partiesrepo/timedependentparty-1.5.0.jar (added)
• src/main/webapp/partiesrepo/winkyagent-1.5.0.jar (added)
• src/test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java (modified) (1 diff)
• src/test/java/geniusweb/partiesserver/JavaClient.java (modified) (1 diff)
• src/test/java/geniusweb/partiesserver/JavaClientTest.java (modified) (2 diffs)
• src/test/java/geniusweb/partiesserver/repository/AvailablePartyTest.java (modified) (1 diff)
• src/test/java/geniusweb/partiesserver/repository/RunningPartyTest.java (modified) (1 diff)
• src/test/java/geniusweb/partiesserver/websocket/PartySocketTest.java (modified) (1 diff)

pom.xml

@@ -6 +6 @@
         <artifactId>partiesserver</artifactId>
         <packaging>war</packaging>
-        <version>1.4.4</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.5.0</version> <!-- must equal ${geniusweb.version} -->
         <name>partiesserver Maven Webapp</name>
         <url>http://maven.apache.org</url>
@@ -19 +19 @@
                 <!-- <tomcat.version>8.0.53</tomcat.version> -->
                 <tomcat.version>8.5.20</tomcat.version>
-                <geniusweb.version>1.4.4</geniusweb.version>
+                <geniusweb.version>1.5.0</geniusweb.version>
         </properties>
 
@@ -87 +87 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>tree</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.1.1</version>
                 </dependency>
                 <dependency>
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>files</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.1.1</version>
                 </dependency>
                 <dependency>
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>repository</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.1.1</version>
+                </dependency>
+                <dependency>
+                        <groupId>tudelft.utilities</groupId>
+                        <artifactId>immutablelist</artifactId>
+                        <version>1.1.1</version>
                 </dependency>
 

src/main/java/geniusweb/partiesserver/repository/RunningParty.java

@@ -11 +11 @@
 import geniusweb.actions.PartyId;
 import geniusweb.connection.DefaultConnection;
+import geniusweb.inform.Inform;
 import geniusweb.partiesserver.RunningPartiesUpdater;
 import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Party;
-import geniusweb.party.inform.Inform;
 import tudelft.utilities.repository.RepoElement;
 

src/main/java/geniusweb/partiesserver/websocket/PartySocket.java

@@ -26 +26 @@
 import geniusweb.actions.PartyId;
 import geniusweb.connection.ConnectionEnd;
+import geniusweb.inform.Inform;
+import geniusweb.inform.Settings;
 import geniusweb.partiesserver.repository.RunningPartiesRepo;
 import geniusweb.partiesserver.repository.RunningParty;
 import geniusweb.party.Party;
-import geniusweb.party.inform.Inform;
-import geniusweb.party.inform.Settings;
 import geniusweb.references.Reference;
 import tudelft.utilities.listener.Listener;

src/test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java

@@ -31 +31 @@
 
 public class AvailablePartiesUpdaterTest {
-        private static final String RANDOMPARTY = "target/jars/randomparty-1.4.4.jar";
+        private static final String RANDOMPARTY = "target/jars/randomparty-1.5.0.jar";
         private static final int TESTRATE = 200; // check file changes every 200ms
         @SuppressWarnings("unchecked")

src/test/java/geniusweb/partiesserver/JavaClient.java

@@ -12 +12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.party.inform.Inform;
+import geniusweb.inform.Inform;
 
 /**

src/test/java/geniusweb/partiesserver/JavaClientTest.java

@@ -25 +25 @@
 
 import geniusweb.actions.PartyId;
-import geniusweb.party.inform.Settings;
-import geniusweb.party.inform.YourTurn;
+import geniusweb.inform.Settings;
+import geniusweb.inform.YourTurn;
 import geniusweb.progress.Progress;
 import geniusweb.progress.ProgressRounds;
@@ -39 +39 @@
  */
 public class JavaClientTest {
-        private static final String RANDOMPARTY = "http://localhost:8080/partiesserver/run/randomparty-1.4.4";
+        private static final String RANDOMPARTY = "http://localhost:8080/partiesserver/run/randomparty-1.5.0";
         // private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
 //      private static final String JOBS1PROFILE = "{\"LinearAdditiveUtilitySpace\":{\"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},\"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\"}}";

src/test/java/geniusweb/partiesserver/repository/AvailablePartyTest.java

@@ -6 +6 @@
 import org.junit.Before;
 
+import geniusweb.inform.Inform;
 import geniusweb.party.Capabilities;
 import geniusweb.party.DefaultParty;
-import geniusweb.party.inform.Inform;
 import tudelft.utilities.junit.GeneralTests;
 

src/test/java/geniusweb/partiesserver/repository/RunningPartyTest.java

@@ -17 +17 @@
 
 import geniusweb.actions.PartyId;
+import geniusweb.inform.Inform;
 import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Capabilities;
 import geniusweb.party.DefaultParty;
 import geniusweb.party.Party;
-import geniusweb.party.inform.Inform;
 import tudelft.utilities.junit.GeneralTests;
 

src/test/java/geniusweb/partiesserver/websocket/PartySocketTest.java

@@ -24 +24 @@
 import geniusweb.actions.PartyId;
 import geniusweb.connection.ConnectionEnd;
+import geniusweb.inform.Inform;
+import geniusweb.inform.YourTurn;
 import geniusweb.partiesserver.repository.RunningPartiesRepo;
 import geniusweb.partiesserver.repository.RunningParty;
 import geniusweb.party.Party;
-import geniusweb.party.inform.Inform;
-import geniusweb.party.inform.YourTurn;
 import tudelft.utilities.logging.Reporter;