Skip to content
This repository has been archived by the owner on Jun 30, 2024. It is now read-only.

Commit

Permalink
build(deps): bump the java-dependencies group with 1 update
Browse files Browse the repository at this point in the history
Bumps the java-dependencies group with 1 update: [org.matsim:matsim-all](https://github.com/matsim-org/matsim).

- [Release notes](https://github.com/matsim-org/matsim/releases)
- [Commits](https://github.com/matsim-org/matsim/commits)

---
updated-dependencies:
- dependency-name: org.matsim:matsim-all
  dependency-type: direct:production
  dependency-group: java-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and michalmac committed Oct 29, 2023
1 parent d022de7 commit 3c73041
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>matsim-all</artifactId>
<version>16.0-2023w41</version>
<version>16.0-2023w43</version>
<relativePath/>
</parent>

Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/matsim/maas/RunMaas.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,18 @@ public static void main(String[] args) {
}

public static void run(String configFile, boolean otfvis) {
Config config = ConfigUtils.loadConfig(configFile, new MultiModeDrtConfigGroup(),
new MultiModeTaxiConfigGroup(), new DvrpConfigGroup(), new OTFVisConfigGroup());
Config config = ConfigUtils.loadConfig(configFile, new MultiModeDrtConfigGroup(), new MultiModeTaxiConfigGroup(), new DvrpConfigGroup(),
new OTFVisConfigGroup());
Scenario scenario = DrtControlerCreator.createScenarioWithDrtRouteFactory(config);
ScenarioUtils.loadScenario(scenario);
config.controler()
.setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.overwriteExistingFiles);
config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.overwriteExistingFiles);
Controler controler = new Controler(scenario);
controler.addOverridingModule(new MultiModeDrtModule());
controler.addOverridingModule(new MultiModeTaxiModule());

controler.addOverridingModule(new DvrpModule());
controler.configureQSimComponents(DvrpQSimComponents.activateAllModes(MultiModeTaxiConfigGroup.get(config),
MultiModeDrtConfigGroup.get(config)));
controler.configureQSimComponents(
DvrpQSimComponents.activateAllModes(MultiModeTaxiConfigGroup.get(config), MultiModeDrtConfigGroup.get(config)));

if (otfvis) {
controler.addOverridingModule(new OTFVisLiveModule());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/maas/taxi/RunRobotaxiExample.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static void main(String[] args) {
public static void run(String configFile, boolean otfvis, int lastIteration) {
Config config = ConfigUtils.loadConfig(configFile, new DvrpConfigGroup(), new OTFVisConfigGroup(),
new MultiModeTaxiConfigGroup());
config.controler().setLastIteration(lastIteration);
config.controller().setLastIteration(lastIteration);

TaxiControlerCreator.createControler(config, otfvis).run();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/maas/taxi/RunTaxiExample.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static void run(String configFile, boolean otfvis, int lastIteration) {
// load config
Config config = ConfigUtils.loadConfig(configFile, new MultiModeTaxiConfigGroup(), new DvrpConfigGroup(),
new OTFVisConfigGroup());
config.controler().setLastIteration(lastIteration);
config.controller().setLastIteration(lastIteration);

TaxiControlerCreator.createControler(config, otfvis).run();
}
Expand Down

0 comments on commit 3c73041

Please sign in to comment.