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.

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

Tag transit stops served by certain mode #25

Closed
wants to merge 142 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
df25a0b
Started code review, changes, so it complies with vsp defaults
GregorRyb Jul 4, 2023
59c8bf3
add pt comments
vsp-gleich Jul 6, 2023
b955191
Fix mistake with vehicle bike and update matsim version
GregorRyb Jul 25, 2023
43efb53
comment out old code and old csv dependency to fix test
GregorRyb Jul 26, 2023
989b93d
Population Comparison
GregorRyb Oct 2, 2023
ad581b3
Add further analysis
GregorRyb Oct 10, 2023
00c5a72
{WIP} start processing of the open population
GregorRyb Oct 17, 2023
61f74c3
switch to correct directory structure
GregorRyb Oct 18, 2023
78863d8
fix arguments for resolve grid coordinates
rakow Oct 19, 2023
fdf88b5
simplified run options, make URLs to public files the default
rakow Nov 28, 2023
b56b13a
update MATSim version, add shp file for simwrapper dashboards
rakow Nov 29, 2023
136d8aa
update pom structure
rakow Nov 29, 2023
2380807
update pom and calibrate script
rakow Nov 29, 2023
27b77f9
update person filter
rakow Nov 29, 2023
2d5f87f
update maven and fix test error
rakow Nov 29, 2023
ac74112
Merge branch 'master' into maintenance
rakow Jan 9, 2024
5f495ba
update MATSim version including update to JUnit5
rewertvsp Feb 12, 2024
942df4e
add basic functions to add commercial traffic from given data
rewertvsp Feb 12, 2024
1c007db
add BicycleModule
rewertvsp Feb 12, 2024
d4b7fdd
fix test
rewertvsp Feb 12, 2024
9fed123
simplify
rewertvsp Feb 12, 2024
4323337
add empty case for parameter
rewertvsp Feb 13, 2024
351adc8
add small scale and merge plans to generate freight Demand
rewertvsp Feb 13, 2024
e864a4e
update project setup
rakow Mar 18, 2024
990c129
disable failing checkstyle for now
rakow Mar 18, 2024
2847404
add 3pct open config and run class
rakow Mar 18, 2024
e07ee6b
set sonar config
rakow Mar 18, 2024
85ba4f9
fix small code issues
rakow Mar 18, 2024
2ad1007
fix few more issues
rakow Mar 18, 2024
c71bd9f
code cleanup
rakow Mar 18, 2024
76cd6cd
use sonar cloud automatic setup
rakow Mar 18, 2024
83ac94c
change separator
rewertvsp Mar 26, 2024
6c4be1d
add method to generate commercial traffic
rewertvsp Mar 26, 2024
63de657
update investigationAreaData.csv
rewertvsp Apr 9, 2024
96a08e0
add the current version of the generation of ruhr freight traffic
rewertvsp Apr 11, 2024
333e040
change column name
rewertvsp Apr 15, 2024
40e9008
update commercial generation pipeline
rewertvsp Apr 15, 2024
1a6f87b
add plan generation for LFT trips
rewertvsp Apr 15, 2024
fc2b84e
delete unneeded class
rewertvsp Apr 15, 2024
b305290
update matsim version
rewertvsp Apr 15, 2024
7fbc55a
comment out tsv export
rewertvsp Apr 15, 2024
e7524a4
fix imports
rewertvsp Apr 15, 2024
1d314ba
update vehicle types file
rewertvsp Apr 15, 2024
580065f
update creation demand file
rewertvsp Apr 15, 2024
6128b6c
update plan generation from carriers including merging activities
rewertvsp Apr 16, 2024
d974c43
clean up
rewertvsp Apr 16, 2024
6523c53
add configurable jspritIterations
rewertvsp Apr 18, 2024
094e1bd
use default TimeCalculator
rewertvsp Apr 18, 2024
fbb5924
add class to add modes to network
rewertvsp Apr 24, 2024
d7b6a49
update MATSim version
rewertvsp Apr 24, 2024
fc42f2a
update vehicles file
rewertvsp Apr 24, 2024
966206f
add current version
rewertvsp Apr 24, 2024
8b14263
add read of parcel delivery relations
rewertvsp Apr 26, 2024
11bee15
add goodsType information
rewertvsp Apr 26, 2024
c99cdac
change log style
rewertvsp Apr 29, 2024
70b62c6
update and rename DefaultDepartureTimeCalculator
rewertvsp Apr 29, 2024
3b6653f
update DefaultDemandPerDayCalculator
rewertvsp Apr 29, 2024
940eff4
update to latest version
rewertvsp Apr 29, 2024
b4f40db
update MATSim-Version
rewertvsp Apr 29, 2024
420bd18
add FTL-KV for FTL trips
rewertvsp Apr 29, 2024
2022906
add comments
rewertvsp Apr 29, 2024
e20ccc1
adjust subpopulation
rewertvsp Apr 29, 2024
0c5a13e
add detection of zone parcel delivery
rewertvsp Apr 29, 2024
1fe5d2b
add destination cell for parcel delivery
rewertvsp Apr 29, 2024
501b5d5
create carriers for each zone
rewertvsp Apr 29, 2024
55bf28b
fix
rewertvsp Apr 29, 2024
c4e6c8e
fix empty carrier
rewertvsp Apr 29, 2024
063f4db
change carrier names
rewertvsp Apr 29, 2024
b326be8
change type
rewertvsp Apr 29, 2024
fe6f187
style
rewertvsp Apr 29, 2024
34ef601
add assumption for B2B delivery
rewertvsp Apr 29, 2024
2371c8d
change defaults
rewertvsp Apr 30, 2024
c3830c9
create v2.0 directory
rewertvsp Apr 30, 2024
ad13509
revert to v1.0 version
rewertvsp Apr 30, 2024
3ed44c1
adjust path to 2.0
rewertvsp Apr 30, 2024
7cc2913
change log style
rewertvsp Apr 30, 2024
f638b1c
rename method
rewertvsp Apr 30, 2024
31cf6c2
remove exception
rewertvsp Apr 30, 2024
153ab0d
chnage person Id
rewertvsp Apr 30, 2024
476bd5a
spelling
rewertvsp Apr 30, 2024
f8adb1c
update to v2.0
rewertvsp Apr 30, 2024
65055a3
fix times
rewertvsp Apr 30, 2024
179f406
separate freight transport in two different parts
rewertvsp Apr 30, 2024
e2813b9
update vehicleTypes
rewertvsp Apr 30, 2024
846b042
add vehicleTypes of FTL and add separate return trips
rewertvsp Apr 30, 2024
42dfe68
comment
rewertvsp Apr 30, 2024
621365a
Added Transfer of ModeRestrictions from .shp to MatSim-network
Aleksander1234519 Apr 30, 2024
60da76d
Merge remote-tracking branch 'origin/integrateCommercialTraffic' into…
Aleksander1234519 May 2, 2024
d1c5698
Merge remote-tracking branch 'origin/integrateCommercialTraffic' into…
rewertvsp May 6, 2024
dd8d41b
rename output carriers
rewertvsp May 6, 2024
ee52987
fix wrong bracket
rewertvsp May 6, 2024
07189b8
rename model version
rewertvsp May 6, 2024
46afbc1
adjust comments
rewertvsp May 7, 2024
01324dd
add sampling of the waste/parcel tours
rewertvsp May 7, 2024
1b86acc
add possibility to use existing carrier files
rewertvsp May 7, 2024
2759938
add comment
rewertvsp May 7, 2024
87aa019
Merge pull request #18 from matsim-scenarios/maintenance
GregorRyb May 7, 2024
0260984
set freespeed factor
rakow May 13, 2024
2908979
update version and use java 21, create bast counts data
rakow May 13, 2024
cec9486
fix sampling
rewertvsp May 14, 2024
127bb4e
clean up
rewertvsp May 14, 2024
fa44332
clean up
rewertvsp May 14, 2024
775f13d
add comment and correct case
rewertvsp May 14, 2024
b3c6290
add comment
rewertvsp May 14, 2024
7c97b9c
Merge remote-tracking branch 'refs/remotes/origin/develop' into integ…
rewertvsp May 14, 2024
fe3e8c8
Merge pull request #20 from matsim-scenarios/integrateCommercialTraffic
rakow May 14, 2024
ceb4208
add small scale commercial contrib
rewertvsp May 14, 2024
f3fcf87
add new gtfs data
GregorRyb May 16, 2024
2d4deaf
update cycling speed
GregorRyb May 16, 2024
eba498a
add create_ref.py
GregorRyb May 16, 2024
5dd2131
update MATSim version
rewertvsp May 16, 2024
778be9f
clean up
rewertvsp May 16, 2024
5e66532
Merge pull request #22 from matsim-scenarios/updateBikeAndGTFS
rakow May 16, 2024
f8c4a9d
Merge pull request #23 from matsim-scenarios/create_ref
rakow May 16, 2024
616bb46
add comments
rewertvsp May 16, 2024
164e14f
add share of person waste
rewertvsp May 16, 2024
7a2aa85
clean up
rewertvsp May 16, 2024
35b9911
change mode of long distance freight to truck40t
rewertvsp May 16, 2024
58515aa
add plan variants to small scale commercial traffic
rewertvsp May 16, 2024
aa19544
update class to integrate existing LTL trips into small scale commerc…
rewertvsp May 16, 2024
f05b20a
add KEP data input
rewertvsp May 16, 2024
5443625
clean up
rewertvsp May 16, 2024
d85a38b
fix bug with return trip
rewertvsp May 16, 2024
7b0f9d9
style
rewertvsp May 16, 2024
43369db
add output file creation
rewertvsp May 16, 2024
be6ae2c
update pom (matsim version + junit 5)
rewertvsp May 17, 2024
405f1fe
add vpcells location
rewertvsp May 17, 2024
96fa9fb
reorder and use osm path
rewertvsp May 17, 2024
d2d2def
formatting
rewertvsp May 17, 2024
de7990d
update pt and car cost
GregorRyb May 17, 2024
b456267
update ride params and some renaming
GregorRyb May 17, 2024
3acd355
adapt TagTransitSchedule to allow for mode filtering
vsp-gleich May 17, 2024
a68c05c
update gtfs2matsim
vsp-gleich May 17, 2024
ffefeec
update matsim-libs, compile errors
vsp-gleich May 17, 2024
04dd2c3
use new methods
rewertvsp May 18, 2024
8a3e138
create LTL carriers separately
rewertvsp May 21, 2024
3a62d9d
fix sampling
rewertvsp May 21, 2024
f0d16b2
change to latest version of class
rewertvsp May 21, 2024
1d115aa
Merge pull request #24 from matsim-scenarios/update_carCost
rewertvsp May 21, 2024
d1fc6a8
Merge remote-tracking branch 'origin/develop' into tagTransitStops
vsp-gleich May 21, 2024
edcb248
use correct matsim-libs version
vsp-gleich May 22, 2024
890943e
run TagTransitSchedule automatically from CreateSupply
vsp-gleich May 22, 2024
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
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

root = true

[*]
charset = utf-8
end_of_line = lf


[*.java]
indent_style = tab
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 150


[*.{xml, xsd, dtd}]
max_line_length = off
indent_style = tab
trim_trailing_whitespace = true
insert_final_newline = true
indent_size = 4
85 changes: 72 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,38 +1,97 @@
name: build

on: [ push, pull_request ]
on: push

jobs:
build:

checkstyle:
#run if push or pull_requests from fork
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
name: Checkstyle

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 21
architecture: x64
distribution: adopt
cache: maven

- name: Checkstyle
run: mvn --batch-mode --update-snapshots checkstyle:checkstyle

enforce:
#run if push or pull_requests from fork
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
name: Maven Dependencies

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 21
architecture: x64
distribution: adopt
cache: maven

- name: Package
run: mvn --batch-mode --update-snapshots enforcer:enforce

test:
#run if push or pull_requests from fork
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
name: Tests

runs-on: ubuntu-latest
timeout-minutes: 45

strategy:
fail-fast: false
matrix:
java: [ 17 ]
java: [21]

steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
- uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
architecture: x64
distribution: zulu
distribution: adopt
cache: maven

- name: Test
run: mvn --batch-mode --update-snapshots test -Dmatsim.preferLocalDtds=true -Dmaven.javadoc.skip -e
- uses: actions/upload-artifact@v3
with:
name: test-coverage
path: target/site/jacoco/

- name: Cache Maven packages
uses: actions/cache@v3
package:
#run if push or pull_requests from fork
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
needs: [checkstyle, enforce, test]
name: Package

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
java-version: 21
architecture: x64
distribution: adopt
cache: maven

- name: Package
run: mvn -B package --file pom.xml -Dmatsim.preferLocalDtds=true -Dmaven.javadoc.skip -e
run: mvn --batch-mode --update-snapshots package -DskipTests -Dmatsim.preferLocalDtds=true -Dmaven.javadoc.skip -e
- run: mkdir staging && cp *.jar staging
- uses: actions/upload-artifact@v3
with:
name: Package
path: staging

env:
MAVEN_OPTS: -Xmx10G
MAVEN_OPTS: -Xmx512m
12 changes: 7 additions & 5 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
name: Publish package to GitHub Packages
name: Publish package
on:
release:
types: [ created ]
types: [created]
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 17
distribution: zulu
java-version: 21
architecture: x64
distribution: adopt

- name: Publish package
run: mvn --batch-mode deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

env:
MAVEN_OPTS: -Xmx10G
MAVEN_OPTS: -Xmx512m
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
Loading
Loading