Skip to content

Commit

Permalink
project setup fix
Browse files Browse the repository at this point in the history
  • Loading branch information
davibicudo committed Feb 26, 2018
1 parent b5b88e5 commit 88f3315
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 39 deletions.
2 changes: 1 addition & 1 deletion config_OSM_Basel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<module name="OsmConverter" >

<!-- If true: The first two digits of the maxspeed tag are used if it cannot be parsed (e.g. "50; 80" or similar). -->
<param name="guessFreeSpeed" value="false" />
<param name="guessFreeSpeed" value="true" />

<!-- Sets whether the detailed geometry of the roads should be retained in the conversion or not.
Keeping the detailed paths results in a much higher number of nodes and links in the resulting MATSim network.
Expand Down
89 changes: 54 additions & 35 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<id>matsim-eth</id>
<url>http://dl.bintray.com/matsim-eth/matsim</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
Expand All @@ -30,58 +34,73 @@
<version>0.10.0-eth</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-xml -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-xml</artifactId>
<version>0.44.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-xml -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-areafilter</artifactId>
<version>0.44.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-xml -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-xml</artifactId>
<version>0.44.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-xml -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-areafilter</artifactId>
<version>0.44.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-pbf -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-pbf</artifactId>
<version>0.44.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-core -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-core</artifactId>
<version>0.44.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-pbf -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-pbf</artifactId>
<version>0.44.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openstreetmap.osmosis/osmosis-core -->
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-core</artifactId>
<version>0.44.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.9</version>
</dependency>

<!--
<dependency>
<groupId>com.github.sebhoerl</groupId>
<artifactId>baseline_scenario</artifactId>
<version>master-SNAPSHOT</version>
</dependency>
-->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>3.8</version>
</dependency>
<dependency>
<groupId>ch.ethz.matsim</groupId>
<artifactId>baseline_scenario</artifactId>
<version>0.0.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/baseline_scenario-0.0.1-SNAPSHOT.jar</systemPath>
<scope>system</scope>
<systemPath>/Users/bicudo/Documents/eclipse/dependencies/baseline_scenario-0.0.1-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>org.matsim</groupId>
<artifactId>pt2matsim</artifactId>
<version>0.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/pt2matsim-0.0.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>3.8</version>
<scope>system</scope>
<systemPath>/Users/bicudo/Documents/eclipse/dependencies/pt2matsim-0.0.0-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies>
<properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.matsim.basel.schedule;
package ch.ethz.matsim.basel.schedule;

import java.io.IOException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.matsim.basel.schedule;
package ch.ethz.matsim.basel.schedule;

import java.util.Arrays;
import java.util.HashSet;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.matsim.basel.schedule;
package ch.ethz.matsim.basel.schedule;

import java.io.FileReader;
import java.io.IOException;
Expand Down
Binary file not shown.
Binary file removed src/main/resources/pt2matsim-0.0.0-SNAPSHOT.jar
Binary file not shown.

0 comments on commit 88f3315

Please sign in to comment.