update matsim and java versions

matsim-scenarios · May 7, 2024 · 2bd8eb2 · 2bd8eb2
1 parent 867ad96
commit 2bd8eb2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -91,7 +91,7 @@ input/sumo.net.xml: input/network.osm
 $p/berlin-$V-network.xml.gz: input/sumo.net.xml
 	$(sc) prepare network-from-sumo $< --target-crs $(CRS) --lane-restrictions REDUCE_CAR_LANES --output $@
 
-	$(sc) prepare clean-network $@ --output $@ --modes car,ride,truck
+	$(sc) prepare clean-network $@ --output $@ --modes car,ride,truck --remove-turn-restrictions
 
 	$(sc) prepare reproject-network\
 	 --input $@	--output $@\

diff --git a/input/v6.2/berlin-v6.2-routes-ref.csv.gz b/input/v6.2/berlin-v6.2-routes-ref.csv.gz
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-		<version>2025.0-PR3160</version>
+		<version>2025.0-PR3257</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
 <!--		<version>2025.0-SNAPSHOT</version>-->

diff --git a/src/main/sh/job.sh b/src/main/sh/job.sh
@@ -50,7 +50,7 @@ echo ""
 echo "command is $command"
 
 echo ""
-module add java/17
+module add java/21
 java -version
 
 $command
diff --git a/src/main/sh/runCalib.sh b/src/main/sh/runCalib.sh
@@ -19,7 +19,7 @@ echo ""
 
 source env/bin/activate
 
-module add java/17
+module add java/21
 java -version
 
 $command