Skip to content

Commit

Permalink
Merge pull request #48 from matsim-org/16.x
Browse files Browse the repository at this point in the history
add simwrapper from 16.x snapshot
  • Loading branch information
paulheinr authored May 8, 2024
2 parents a574684 + 71c8d84 commit 4d1b59b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
21 changes: 17 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<parent>
<groupId>org.matsim</groupId>
<artifactId>matsim-all</artifactId>

<!-- Options: stable build based on pull requests (e.g. 16.0-PR2778), weekly (e.g. 15.0-2023w01) or official (e.g. 14.0) releases -->
<!-- <version>16.0-PR2509</version>-->
<version>2024.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim</groupId>
<artifactId>matsim-example-project</artifactId>
<version>0.0.1-SNAPSHOT</version>

<name>MATSim example project</name>
<description>MATSim example project</description>

<properties>
<!-- Options: stable build based on pull requests (e.g. 15.0-PR2344), weekly (e.g. 15.0-2023w01) or official (e.g. 14.0) releases -->
<!-- <matsim.version>16.0-PR2509</matsim.version>-->
<matsim.version>2024.0</matsim.version>

<!-- Don't change version here, but in the parent section above! -->
<matsim.version>${parent.version}</matsim.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down Expand Up @@ -132,6 +140,11 @@
<artifactId>application</artifactId>
<version>${matsim.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>simwrapper</artifactId>
<version>${matsim.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>vsp</artifactId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/matsim/project/RunMatsimApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ protected void prepareControler(Controler controler) {
// possibly modify controler here

// controler.addOverridingModule( new OTFVisLiveModule() ) ;
// controler.addOverridingModule( new SimWrapperModule() ) ;


// ---
Expand Down
Binary file not shown.

0 comments on commit 4d1b59b

Please sign in to comment.