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

build(deps): bump the java-dependencies group with 1 update #158

Merged
merged 1 commit into from
Oct 29, 2023
+8 −9
Merged

build(deps): bump the java-dependencies group with 1 update #158

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
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 @@ -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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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