From 97b693725c7210f19ede7e532b9dcf8bba9659a3 Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Fri, 15 Nov 2024 15:27:21 +0100 Subject: [PATCH 1/3] remove dependency to vsp contrib, as it is no longer needed update import for annotation remove NotNull annotation --- pom.xml | 6 ------ .../ExampleTwoLspsGroceryDeliveryMultipleChains.java | 3 +-- ...ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index ffa13b01..3e938dc1 100644 --- a/pom.xml +++ b/pom.xml @@ -37,12 +37,6 @@ ${project.parent.version} - - org.matsim.contrib - vsp - ${project.parent.version} - - org.matsim diff --git a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java index 80462bde..5c6a4c0d 100644 --- a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java +++ b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java @@ -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; @@ -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( diff --git a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java index c1d277be..e27b2e27 100644 --- a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java +++ b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java @@ -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; @@ -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( From 140fc9d33a88c95fc5876e58633cebda7e8e8391 Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Fri, 15 Nov 2024 15:25:59 +0100 Subject: [PATCH 2/3] comments after Kai/Kai mtg --- src/main/java/org/matsim/freight/logistics/LSPUtils.java | 2 ++ .../ExampleTwoLspsGroceryDeliveryMultipleChains.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/java/org/matsim/freight/logistics/LSPUtils.java b/src/main/java/org/matsim/freight/logistics/LSPUtils.java index 2821a8a0..e40c44e9 100644 --- a/src/main/java/org/matsim/freight/logistics/LSPUtils.java +++ b/src/main/java/org/matsim/freight/logistics/LSPUtils.java @@ -237,6 +237,8 @@ public LogisticChainBuilder addTracker(LSPSimulationTracker 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); } } diff --git a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java index 5c6a4c0d..60ca486f 100644 --- a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java +++ b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java @@ -370,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) From 0c355d1f957832c2af0346da69d5a513efbea27d Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Fri, 22 Nov 2024 17:15:01 +0100 Subject: [PATCH 3/3] fix indentation (and therefore syntax) error --- .github/workflows/GithubActionsCI_maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/GithubActionsCI_maven.yml b/.github/workflows/GithubActionsCI_maven.yml index 207a073a..da1d5f2f 100644 --- a/.github/workflows/GithubActionsCI_maven.yml +++ b/.github/workflows/GithubActionsCI_maven.yml @@ -8,7 +8,7 @@ on: branches-ignore: - 'master' # no need to run after merging to master - 'main' # no need to run after merging to main; main is the "new" master - pull_request: + pull_request: jobs: build_and_test: