Merge pull request #5 from matsim-vsp/developParkingSearch

Develop parking search

README.md

@@ -5,9 +5,9 @@
 
 This repository contains the VSP code for the BENE project.
 
-Projectinformation can found [here](https://www.tu.berlin/strassenplanung/forschung/projekte/aktuelle-projekte/reisebusverkehr-in-grossstaedten).
+Project information can found [here](https://www.tu.berlin/strassenplanung/forschung/projekte/aktuelle-projekte/reisebusverkehr-in-grossstaedten).
 
-Project results can found [here](https://vsp.berlin/simwrapper/public/de/berlin/projects/bene/visualization).
+Project results can found [here](https://vsp.berlin/bene).
 
 ## Project funding partners
 

pom.xml

@@ -11,7 +11,7 @@
 
 	<properties>
 		<!-- release -->
-		<matsim.version>16.0-PR2731</matsim.version>
+		<matsim.version>16.0-PR2891</matsim.version>
 
 		<!-- PR (= pull request) release -->
 		<!--		<matsim.version>13.1-PR1536</matsim.version> -->
@@ -21,8 +21,7 @@
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>17</maven.compiler.release>
 	</properties>
 
 	<repositories>
@@ -176,7 +175,7 @@
 <!--				https://stackoverflow.com/questions/27429097/geotools-cannot-find-hsql-epsg-db-throws-error-nosuchauthoritycodeexception/27431381#27431381)-->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.2</version>
+				<version>3.4.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -215,10 +214,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>14</source>
-                    <target>14</target>
-                </configuration>
+				<version>3.11.0</version>
             </plugin>
         </plugins>
 	</build>

scenarios/config/config_base.xml

@@ -132,6 +132,18 @@
 				<param name="typicalDuration" value="01:00:00" />
 				<param name="typicalDurationScoreComputation" value="relative" />
 			</parameterset>
+			<parameterset type="activityParams" >
+				<param name="activityType" value="waitingForParkingSpace_activity" />
+				<param name="closingTime" value="undefined" />
+				<param name="earliestEndTime" value="undefined" />
+				<param name="latestStartTime" value="undefined" />
+				<param name="minimalDuration" value="undefined" />
+				<param name="openingTime" value="undefined" />
+				<param name="priority" value="1.0" />
+				<param name="scoringThisActivityAtAll" value="true" />
+				<param name="typicalDuration" value="01:00:00" />
+				<param name="typicalDurationScoreComputation" value="relative" />
+			</parameterset>
 
 			<parameterset type="modeParams" >
 				<!-- [utils] alternative-specific constant.  Normally per trip, but that is probably buggy for multi-leg trips. -->

scenarios/config/config_capacityCheck.xml

@@ -31,7 +31,7 @@
 		<!-- The type of routing (least cost path) algorithm used, may have the values: [Dijkstra, AStarLandmarks, FastDijkstra, FastAStarLandmarks, SpeedyALT] -->
 		<param name="routingAlgorithmType" value="SpeedyALT" />
 		<!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->
-		<param name="runId" value="case3" />
+		<param name="runId" value="capacityCheck" />
 		<!-- Comma-separated list of visualizer output file formats. `transims' and `otfvis'. -->
 		<param name="snapshotFormat" value="" />
 		<!-- iterationNumber % writeEventsInterval == 0 defines in which iterations events are written to a file. `0' disables events writing completely. -->
@@ -132,6 +132,18 @@
 				<param name="typicalDuration" value="01:00:00" />
 				<param name="typicalDurationScoreComputation" value="relative" />
 			</parameterset>
+			<parameterset type="activityParams" >
+				<param name="activityType" value="waitingForParkingSpace_activity" />
+				<param name="closingTime" value="undefined" />
+				<param name="earliestEndTime" value="undefined" />
+				<param name="latestStartTime" value="undefined" />
+				<param name="minimalDuration" value="undefined" />
+				<param name="openingTime" value="undefined" />
+				<param name="priority" value="1.0" />
+				<param name="scoringThisActivityAtAll" value="true" />
+				<param name="typicalDuration" value="01:00:00" />
+				<param name="typicalDurationScoreComputation" value="relative" />
+			</parameterset>
 
 			<parameterset type="modeParams" >
 				<!-- [utils] alternative-specific constant.  Normally per trip, but that is probably buggy for multi-leg trips. -->

scenarios/config/config_centralizedParking.xml

@@ -31,7 +31,7 @@
 		<!-- The type of routing (least cost path) algorithm used, may have the values: [Dijkstra, AStarLandmarks, FastDijkstra, FastAStarLandmarks, SpeedyALT] -->
 		<param name="routingAlgorithmType" value="SpeedyALT" />
 		<!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->
-		<param name="runId" value="case2" />
+		<param name="runId" value="centralizedParking" />
 		<!-- Comma-separated list of visualizer output file formats. `transims' and `otfvis'. -->
 		<param name="snapshotFormat" value="" />
 		<!-- iterationNumber % writeEventsInterval == 0 defines in which iterations events are written to a file. `0' disables events writing completely. -->
@@ -132,6 +132,18 @@
 				<param name="typicalDuration" value="01:00:00" />
 				<param name="typicalDurationScoreComputation" value="relative" />
 			</parameterset>
+			<parameterset type="activityParams" >
+				<param name="activityType" value="waitingForParkingSpace_activity" />
+				<param name="closingTime" value="undefined" />
+				<param name="earliestEndTime" value="undefined" />
+				<param name="latestStartTime" value="undefined" />
+				<param name="minimalDuration" value="undefined" />
+				<param name="openingTime" value="undefined" />
+				<param name="priority" value="1.0" />
+				<param name="scoringThisActivityAtAll" value="true" />
+				<param name="typicalDuration" value="01:00:00" />
+				<param name="typicalDurationScoreComputation" value="relative" />
+			</parameterset>
 
 			<parameterset type="modeParams" >
 				<!-- [utils] alternative-specific constant.  Normally per trip, but that is probably buggy for multi-leg trips. -->