Changeset 21 for simplerunner/src/test/resources

Timestamp:

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

Author:

bart

Message:

Version 1.5.

Location:

simplerunner/src/test/resources

Files:

• jobs/jobs1.json (modified) (4 diffs)
• jobs/jobs2.json (modified) (4 diffs)
• mopac.json (added)
• shaoptoursettings.json (modified) (3 diffs)

simplerunner/src/test/resources/jobs/jobs1.json

@@ -34 +34 @@
                                 "discreteutils": {
                                         "valueUtilities": {
-                                                "yes":1,
-                                                "no":0
+                                                "yes": 1,
+                                                "no": 0
                                         }
                                 }
@@ -42 +42 @@
                                 "discreteutils": {
                                         "valueUtilities": {
-                                                "yes":1,
-                                                "no":0
+                                                "yes": 1,
+                                                "no": 0
                                         }
                                 }
@@ -50 +50 @@
                                 "discreteutils": {
                                         "valueUtilities": {
-                                                "low":0,
-                                                "medium":0.5,
-                                                "high":1
+                                                "low": 0,
+                                                "medium": 0.5,
+                                                "high": 1
                                         }
                                 }
@@ -112 +112 @@
                         }
                 },
-                "name": "jobs1"
+                "name": "jobs1",
+                "reservationBid": {
+                        "issuevalues": {
+                                "salary": "3500",
+                                "fte": "0.8",
+                                "work from home": "1",
+                                "lease car": "no",
+                                "permanent contract": "yes",
+                                "career development opportunities": "medium"
+                        }
+                }
         }
 }

simplerunner/src/test/resources/jobs/jobs2.json

@@ -34 +34 @@
                                 "discreteutils": {
                                         "valueUtilities": {
-                                                "yes":0,
-                                                "no":1
+                                                "yes": 0,
+                                                "no": 1
                                         }
                                 }
@@ -42 +42 @@
                                 "discreteutils": {
                                         "valueUtilities": {
-                                                "yes":0.23809523809523808,
-                                                "no":0.761904761904762
+                                                "yes": 0.23809523809523808,
+                                                "no": 0.761904761904762
                                         }
                                 }
@@ -50 +50 @@
                                 "discreteutils": {
                                         "valueUtilities": {
-                                                "low":1.0,
-                                                "medium":0.5,
-                                                "high":0
+                                                "low": 1.0,
+                                                "medium": 0.5,
+                                                "high": 0
                                         }
                                 }
@@ -112 +112 @@
                         }
                 },
-                "name": "jobs2"
+                "name": "jobs2",
+                "reservationBid": {
+                        "issuevalues": {
+                                "salary": "3000",
+                                "fte": "0.8",
+                                "work from home": "0",
+                                "lease car": "no",
+                                "permanent contract": "no",
+                                "career development opportunities": "medium"
+                        }
+                }
         }
 }

simplerunner/src/test/resources/shaoptoursettings.json

@@ -34 +34 @@
                         {
                                 "ProfileList": [
-                                        "file:src/test/resources/jobs/jobs1partial.json?partial=10",
+                                        "file:src/test/resources/jobs/jobs1partial.json",
                                         "file:src/test/resources/jobs/jobs1partial.json"
                                         
@@ -41 +41 @@
                         {
                                 "ProfileList": [
-                                        "file:src/test/resources/jobs/jobs2.json?partial=15",
+                                        "file:src/test/resources/jobs/jobs2.json",
                                         "file:src/test/resources/jobs/jobs2.json"
                                         
@@ -55 +55 @@
                                         "deadlinerounds": {
                                                 "rounds": 10,
-                                                "durationms": 10000
+                                                "durationms": 1000
                                         }
                                 }