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

Jump to bottom

rather develop new version on main branch than v1.1 branch #6

Merged
merged 43 commits into from
Aug 20, 2024
Merged

rather develop new version on main branch than v1.1 branch #6

merged 43 commits into from
Aug 20, 2024

Conversation

simei94
Copy link
Contributor

@simei94 simei94 commented Jul 3, 2024 •
edited
Loading

changes v1.0 -> v1.1 (so far):

  • change from 25pct model scale to 10pct model scale as standard
  • add run class for policy case with a regional drt
  • add run class for policy case with a new rail line between Cottbus and Hoyerswerda
  • ...

simei94 and others added 26 commits May 22, 2024 18:12
@simei94
some comments to clarify configs WIP
bcb3d30
@simei94
more comments
cb0efb7
@simei94
v1.1 10pct config
d823422
@simei94
v1.x
7906fab
@simei94
v1.x
dd97bdd
@simei94
bump to matsim libs PR3302
99bd8c8
@simei94
new counts format for v1.1 (car and freight counts in 1 single file)
be73176
@simei94
drt scenario run class WIP
f3768f6
@simei94
add LausitzPtFareModule for more detailled pt pricing
fdbc02c
@simei94
checkstyle
a8f772b
@simei94
checkstyle
9b98775
@simei94
make upper bound factor class var
1eb73f6
@simei94
add TODO
3306e0a
@simei94
run class for PT scenario WIP
be787a5
@simei94
add test for pt policy scenario
d546b87
@simei94
bump up jacoco version
31c0581
@simei94
Merge pull request #3 from matsim-scenarios/1.1_ptFareModule
1e914e0 
add LausitzPtFareModule for more detailled pt pricing
@simei94
Revert "add LausitzPtFareModule for more detailled pt pricing"
d4899b6
@simei94
Merge pull request #4 from matsim-scenarios/revert-3-1.1_ptFareModule
ad219ac 
Revert "add LausitzPtFareModule for more detailled pt pricing"
@simei94
checkstyle
2f15e16
@simei94
Merge pull request #5 from matsim-scenarios/1.1_ptPolicyCase
0e07f79 
1.1 pt policy case
@simei94
add 100pct sample option
8e71628
@simei94
age and sex attributes were renamed by senozon
ed6da23
@simei94
matsim-input-files was moved
e0365b5
@simei94
in geopandas op parameter was replaced through predicate parameter
9f08a87
@simei94
add comment
927f1a6
@simei94 simei94 marked this pull request as draft July 3, 2024 08:50
@simei94
Copy link
Contributor Author

simei94 commented Jul 3, 2024

this PR can only be merged if there are no more branches with prefix "v1.1_" left. Those need to be merged into the 1.1 branch first (or deleted).

simei94 and others added 15 commits July 4, 2024 11:02
@simei94
add changes from ptFareModule branch manually. Github does not recogn…
9c81a5c 
…ize the changes when creating a PR?!
@simei94
add group ref data to trip dashboard
81e5610
@simei94
switch to 10pct in config runId + some comments
cd59942
@simei94
set performing in code rather than config.xml
c8a35f2
@simei94
delete sampleSize from context params
1cfcd79
@rewertvsp
add first inputs for adding small-scale commercial traffic
0b914da
@rakow
Merge branch 'refs/heads/main' into 1.1
555e225 
# Conflicts:
#	pom.xml
@rakow
update dashboards and ref data, age and economic status is now includ…
99b3b72 
…ed in the reference data
@simei94
use FareZoneBasedPtFareHandler instead of DistanceBasedPtFareHandler
a6d0ef8
@simei94
add absolute path starting from config
c395ebc
@simei94
finalize small scale commercial traffic impl and creation
059303f
@rewertvsp @simei94
add first inputs for adding small-scale commercial traffic
1c7ac5d
@simei94
finalize small scale commercial traffic impl and creation
30ac50d
@simei94
Merge remote-tracking branch 'origin/1.1_commercial_traffic' into 1.1…
dfdb827 
…_commercial_traffic

# Conflicts:
#	src/main/java/org/matsim/run/LausitzScenario.java
@simei94
Merge pull request #8 from matsim-scenarios/1.1_commercial_traffic
c9f028d 
1.1 commercial traffic
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
1 New Critical Issues (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@simei94 simei94 marked this pull request as ready for review August 20, 2024 14:06
@simei94 simei94 changed the title v1.1 rather develop new version on main branch than v1.1 branch Aug 20, 2024
@simei94 simei94 merged commit ab3dae0 into main Aug 20, 2024
3 of 5 checks passed
@simei94 simei94 deleted the 1.1 branch August 20, 2024 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@simei94 @rakow @rewertvsp