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

Revert "add LausitzPtFareModule for more detailled pt pricing" #4

Merged
merged 1 commit into from
Jun 26, 2024
+3 −83
Merged

Revert "add LausitzPtFareModule for more detailled pt pricing" #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
77 changes: 0 additions & 77 deletions src/main/java/org/matsim/run/LausitzPtFareModule.java
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions src/main/java/org/matsim/run/LausitzScenario.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,8 @@ public LausitzScenario(String configPath) {
super(configPath);
}

// TODO: change version variable to 1.1 and rather use this constructor than the follwoing
// public LausitzScenario() {
// super(String.format("input/v%s/lausitz-v%s-10pct.config.xml", VERSION, VERSION));
// }
public LausitzScenario() {
super("input/v1.1/lausitz-v1.1-10pct.config.xml");
super(String.format("input/v%s/lausitz-v%s-25pct.config.xml", VERSION, VERSION));
}

public static void main(String[] args) {
Expand Down Expand Up @@ -110,6 +106,8 @@ protected Config prepareConfig(Config config) {

// TODO: Config options

// TODO: recreate counts format with car and trucks

return config;
}

Expand Down Expand Up @@ -137,7 +135,6 @@ protected void prepareControler(Controler controler) {
controler.addOverridingModule(new AbstractModule() {
@Override
public void install() {
install(new LausitzPtFareModule());

bind(ScoringParametersForPerson.class).to(IncomeDependentUtilityOfMoneyPersonScoringParameters.class).asEagerSingleton();

Expand Down
Loading