From c67a16c232902d9bc956fb379d7cad7d7236e6aa Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Fri, 19 Jan 2024 14:51:03 +0100 Subject: [PATCH] fix compile errors --- .../org/matsim/freight/logistics/LSPPlanImpl.java | 15 +++++++-------- .../CollectionLSPReplanningTest.java | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/matsim/freight/logistics/LSPPlanImpl.java b/src/main/java/org/matsim/freight/logistics/LSPPlanImpl.java index 14ed7419..96429c30 100644 --- a/src/main/java/org/matsim/freight/logistics/LSPPlanImpl.java +++ b/src/main/java/org/matsim/freight/logistics/LSPPlanImpl.java @@ -58,7 +58,6 @@ public InitialShipmentAssigner getAssigner() { @Override public LSPPlan setAssigner(InitialShipmentAssigner assigner) { this.assigner = assigner; - this.assigner.setLSP(this.lsp); return this; } @@ -101,13 +100,13 @@ public LSP getLSP() { @Override public void setLSP(LSP lsp) { this.lsp = lsp; - if (assigner != null) { - this.assigner.setLSP(lsp); - // yy vom Design her wäre es vlt. einfacher und logischer, wenn der assigner einen backpointer - // auf den LSPPlan hätte. Dann - // müsste man nicht (wie hier) hedgen gegen unterschiedliche Initialisierungssequenzen. kai, - // may'22 - } +// if (assigner != null) { +// this.assigner.setLSP(lsp); +// // yy vom Design her wäre es vlt. einfacher und logischer, wenn der assigner einen backpointer +// // auf den LSPPlan hätte. Dann +// // müsste man nicht (wie hier) hedgen gegen unterschiedliche Initialisierungssequenzen. kai, +// // may'22 +// } for (LogisticChain solution : logisticChains) { solution.setLSP(lsp); } diff --git a/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java index 44dce861..aa22e106 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java @@ -190,7 +190,6 @@ public void initialize() { LSPStrategyManager manager = new LSPStrategyManagerImpl(); { InitialShipmentAssigner maybeTodayAssigner = new MaybeTodayAssigner(); - maybeTodayAssigner.setLSP( collectionLSP ); final GenericPlanStrategy strategy = new TomorrowShipmentAssignerStrategyFactory( maybeTodayAssigner ).createStrategy(); // (a factory makes sense if it is passed around; in this case it feels like overkill. kai, jul'22) manager.addStrategy( strategy, null, 1 );