Merge remote-tracking branch 'origin/main' into kmt_create_HubHandlin…

…gEvents
matsim-vsp · Nov 16, 2023 · 9010209 · 9010209
2 parents 7823346 + a75a3fe
commit 9010209
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/...eight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java b/...eight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java
@@ -90,11 +90,11 @@ public void install() {
 				bind(LSPStrategyManager.class).toProvider(() -> {
 					LSPStrategyManager strategyManager = new LSPStrategyManagerImpl();
 					strategyManager.addStrategy(new GenericPlanStrategyImpl<>(new ExpBetaPlanSelector<>(new ScoringConfigGroup())), null, 1);
-//					strategyManager.addStrategy(new RoundRobinDistributionAllShipmentsStrategyFactory().createStrategy(), null, 1);
-//					strategyManager.addStrategy(new RandomDistributionAllShipmentsStrategyFactory().createStrategy(), null, 1);
-//					strategyManager.addStrategy(new RebalancingShipmentsStrategyFactory().createStrategy(), null, 1);
-//					strategyManager.addStrategy(new RandomShiftingStrategyFactory().createStrategy(), null, 1);
-//					strategyManager.addStrategy(new ProximityStrategyFactory(scenario.getNetwork()).createStrategy(), null, 1);
+//					strategyManager.addStrategy(RoundRobinDistributionAllShipmentsStrategyFactory.createStrategy(), null, 1);
+//					strategyManager.addStrategy(RandomDistributionAllShipmentsStrategyFactory.createStrategy(), null, 1);
+//					strategyManager.addStrategy(RebalancingStrategyFactory.createStrategy(), null, 1);
+					strategyManager.addStrategy(RandomShiftingStrategyFactory.createStrategy(), null, 1);
+//					strategyManager.addStrategy(ProximityStrategyFactory.createStrategy(scenario.getNetwork()), null, 1);
 					strategyManager.setMaxPlansPerAgent(5);
 					strategyManager.setPlanSelectorForRemoval(new LSPWorstPlanForRemovalSelector() );
 					return strategyManager;

diff --git a/...t/logistics/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java b/...t/logistics/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java
@@ -17,11 +17,9 @@
 
 final class RandomDistributionAllShipmentsStrategyFactory {
 
-	private RandomDistributionAllShipmentsStrategyFactory() { } // do not instantiate
+	private RandomDistributionAllShipmentsStrategyFactory() { } // class contains only static methods; do not instantiate
 
 	static GenericPlanStrategy<LSPPlan, LSP> createStrategy() {
-		// yyyy using factory method instead of constructor is a universally accepted approach.  but should be static:
-		// Please refactor.  Thanks!  kai, nov'23
 
 		GenericPlanStrategyImpl<LSPPlan, LSP> strategy = new GenericPlanStrategyImpl<>(new ExpBetaPlanSelector<>(new ScoringConfigGroup()));
 		GenericPlanStrategyModule<LSPPlan> randomModule = new GenericPlanStrategyModule<>() {

diff --git a/...rg/matsim/freight/logistics/example/lsp/multipleChains/RandomShiftingStrategyFactory.java b/...rg/matsim/freight/logistics/example/lsp/multipleChains/RandomShiftingStrategyFactory.java
@@ -21,8 +21,6 @@ class RandomShiftingStrategyFactory {
 	private RandomShiftingStrategyFactory() {} // class contains only static methods; do not instantiate.
 
 	static GenericPlanStrategy<LSPPlan, LSP> createStrategy() {
-		// yyyy using factory method instead of constructor is a universally accepted approach.  but should be static.
-		// Please refactor.  Thanks!  kai, nov'23
 
 		GenericPlanStrategyImpl<LSPPlan, LSP> strategy = new GenericPlanStrategyImpl<>(new ExpBetaPlanSelector<>(new ScoringConfigGroup()));
 		GenericPlanStrategyModule<LSPPlan> randomModule = new GenericPlanStrategyModule<>() {

diff --git a/...a/org/matsim/freight/logistics/example/lsp/multipleChains/RebalancingStrategyFactory.java b/...a/org/matsim/freight/logistics/example/lsp/multipleChains/RebalancingStrategyFactory.java
@@ -22,9 +22,6 @@ class RebalancingStrategyFactory {
 	private RebalancingStrategyFactory() { } // class contains only static methods; do not instantiate
 
 	static GenericPlanStrategy<LSPPlan, LSP> createStrategy() {
-		// yyyy using factory method instead of constructor is a universally accepted approach.  but should be static.
-		// Please refactor.  Thanks!  kai, nov'23
-
 
 		GenericPlanStrategyImpl<LSPPlan, LSP> strategy = new GenericPlanStrategyImpl<>(new ExpBetaPlanSelector<>(new ScoringConfigGroup()));
 		GenericPlanStrategyModule<LSPPlan> loadBalancingModule = new GenericPlanStrategyModule<>() {

diff --git a/...gistics/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java b/...gistics/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java
@@ -39,7 +39,7 @@
 
 	private RoundRobinDistributionAllShipmentsStrategyFactory() { } // class contains only static methods; do not instantiate
 
-	/*package-private*/ GenericPlanStrategy<LSPPlan, LSP> createStrategy() {
+	/*package-private*/ static GenericPlanStrategy<LSPPlan, LSP> createStrategy() {
 		GenericPlanStrategyImpl<LSPPlan, LSP> strategy = new GenericPlanStrategyImpl<>(new ExpBetaPlanSelector<>(new ScoringConfigGroup()));
 		GenericPlanStrategyModule<LSPPlan> roundRobinModule = new GenericPlanStrategyModule<>() {