Merge pull request #1108 from matsim-org/dev.x-update-2025

switch to matsim 2025

.github/workflows/mvn-verify.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

pom.xml

@@ -13,7 +13,7 @@
 		     Therefore we need to use a fixed value here and then refer to the matsim version with ${project.parent.version} -->
 		<!-- Options: stable build based on weekly (e.g. 15.0-PR2344), PR-based (e.g. 15.0-2023w01) or official (e.g. 14.0) releases -->
 <!--		<version>16.0-2024w02</version>-->
-		<version>16.0-2024w15</version>
+		<version>2025.0-PR3235</version>
 		<!--<version>15.0-SNAPSHOT</version>-->
 <!--		<version>16.0-SNAPSHOT</version>-->
 		<relativePath/>
@@ -24,7 +24,7 @@
 
 	<properties>
 		<matsim.version>${project.parent.version}</matsim.version>
-		<maven.compiler.release>17</maven.compiler.release>
+		<maven.compiler.release>21</maven.compiler.release>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>

src/main/java/org/matsim/codeexamples/mobsim/ownMobsimAgent/RunAddAgentSourceExample.java

@@ -78,7 +78,7 @@ public void insertAgentsIntoMobsim(){
 			qsim.insertAgentIntoMobsim( ag );
 
 			// insert vehicle:
-			final Vehicle vehicle = VehicleUtils.getFactory().createVehicle( Id.create( ag.getId(), Vehicle.class ), VehicleUtils.getDefaultVehicleType() );
+			final Vehicle vehicle = VehicleUtils.getFactory().createVehicle( Id.create( ag.getId(), Vehicle.class ), VehicleUtils.createDefaultVehicleType() );
 			QVehicleImpl qVeh = new QVehicleImpl( vehicle );
 			qsim.addParkedVehicle( qVeh, ag.getCurrentLinkId() );
 

src/main/java/org/matsim/codeexamples/mobsim/ownMobsimAgentUsingRouter/RunOwnMobsimAgentUsingRouterExample.java

@@ -79,7 +79,7 @@ public void insertAgentsIntoMobsim() {
 								qsim.insertAgentIntoMobsim(ag);
 
 								// insert vehicle:
-								final Vehicle vehicle = VehicleUtils.getFactory().createVehicle(Id.create(ag.getId(), Vehicle.class), VehicleUtils.getDefaultVehicleType());
+								final Vehicle vehicle = VehicleUtils.getFactory().createVehicle(Id.create(ag.getId(), Vehicle.class), VehicleUtils.createDefaultVehicleType());
 								final Id<Link> linkId4VehicleInsertion = Id.createLinkId(1);
 //								qsim.createAndParkVehicleOnLink(vehicle, linkId4VehicleInsertion);
 								final QVehicle qVeh = new QVehicleImpl( vehicle ) ;

src/main/java/org/matsim/codeexamples/mobsim/ownMobsimAgentWithPerception/RunOwnMobsimAgentWithPerceptionExample.java

@@ -103,7 +103,7 @@ public void insertAgentsIntoMobsim() {
 
 								// insert vehicle:
 								final Id<Vehicle> vehId = Id.create("myVeh", Vehicle.class);
-								final VehicleType vehType = VehicleUtils.getDefaultVehicleType();
+								final VehicleType vehType = VehicleUtils.createDefaultVehicleType();
 								final VehiclesFactory vehFactory = VehicleUtils.getFactory();
 								final Vehicle vehicle = vehFactory.createVehicle(vehId, vehType);
 //								qsim.createAndParkVehicleOnLink(vehicle, startingLinkId);