Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.0.5 #36

Merged
merged 3 commits into from
Nov 25, 2019
Merged

Release 1.0.5 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f672d77
Fix EqasimMainModeIdentifier
sebhoerl Oct 16, 2019
13420ba
Merge pull request #34 from eqasim-org/fix/mmi
sebhoerl Oct 16, 2019
ee83e5c
Release 1.0.5
sebhoerl Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

- No changes yet

**1.0.5**

- Fix transit_walk detection in EqasimMainModeIdentifier

**1.0.4**

- Update Auckland parameters
Expand Down
4 changes: 2 additions & 2 deletions auckland/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<parent>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.eqasim</groupId>
<artifactId>core</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions automated_vehicles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<parent>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.eqasim</groupId>
<artifactId>core</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
12 changes: 11 additions & 1 deletion core/src/main/java/org/eqasim/core/components/EqasimMainModeIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.List;

import org.matsim.api.core.v01.TransportMode;
import org.matsim.api.core.v01.population.Leg;
import org.matsim.api.core.v01.population.PlanElement;
import org.matsim.core.router.MainModeIdentifier;
Expand All @@ -16,6 +17,15 @@ public String identifyMainMode(List<? extends PlanElement> tripElements) {
}
}

return TripStructureUtils.getLegs(tripElements).get(0).getMode();
String singleLegMode = TripStructureUtils.getLegs(tripElements).get(0).getMode();

switch (singleLegMode) {
case TransportMode.transit_walk:
case TransportMode.access_walk:
case TransportMode.egress_walk:
return TransportMode.pt;
default:
return TransportMode.walk;
}
}
}
10 changes: 5 additions & 5 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,33 @@
<parent>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.eqasim</groupId>
<artifactId>automated_vehicles</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>

<dependency>
<groupId>org.eqasim</groupId>
<artifactId>auckland</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>

<dependency>
<groupId>org.eqasim</groupId>
<artifactId>switzerland</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>

<dependency>
<groupId>org.eqasim</groupId>
<artifactId>core</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions ile_de_france/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<parent>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.eqasim</groupId>
<artifactId>core</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<packaging>pom</packaging>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions sao_paulo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<parent>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.eqasim</groupId>
<artifactId>core</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions switzerland/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<parent>
<groupId>org.eqasim</groupId>
<artifactId>eqasim</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.eqasim</groupId>
<artifactId>core</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
</dependencies>

Expand Down