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

Comment #330

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Comment #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97b6937
remove dependency to vsp contrib, as it is no longer needed
kt86 Nov 15, 2024
140fc9d
comments after Kai/Kai mtg
kt86 Nov 15, 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
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>vsp</artifactId>
<version>${project.parent.version}</version>
</dependency>

<!--MATSim examples. Not transitive -->
<dependency>
<groupId>org.matsim</groupId>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/matsim/freight/logistics/LSPUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ public LogisticChainBuilder addTracker(LSPSimulationTracker<LogisticChain> track
}

public LogisticChain build() {
//TODO: Prüfe of das alle Elemente Verbunden sind (in irgendeiner Art). Plus Hinweis auf die Änderung.

return new LogisticChainImpl(this);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...reight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
Expand Down Expand Up @@ -173,7 +172,7 @@ private static Config prepareConfig(String[] args) {
return config;
}

private static @NotNull Controler prepareControler(Scenario scenario) {
private static Controler prepareControler(Scenario scenario) {
log.info("Prepare controler");
Controler controler = new Controler(scenario);
controler.addOverridingModule(
Expand Down Expand Up @@ -371,6 +370,7 @@ private static LogisticChain createTwoEchelonChain(Scenario scenario, String lsp
mainCarrierElement.connectWithNextElement(hubElement);
hubElement.connectWithNextElement(distributionCarrierElement);

//TODO: Hier das Verbinden einfügen und in der Reihenfolge ist es. KMT Nov'24
hubChain =
LSPUtils.LogisticChainBuilder.newInstance(Id.create("hubChain", LogisticChain.class))
.addLogisticChainElement(mainCarrierElement)
Expand Down
3 changes: 1 addition & 2 deletions ...ogistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.matsim.analysis.personMoney.PersonMoneyEventsAnalysisModule;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
Expand Down Expand Up @@ -159,7 +158,7 @@ private static Config prepareConfig(String[] args) {
return config;
}

private static @NotNull Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
private static Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
log.info("Prepare controler");
Controler controler = new Controler(scenario);
controler.addOverridingModule(
Expand Down