This repository has been archived by the owner on Nov 29, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into kmt_create_HubHandlin…
…gEvents # Conflicts: # src/main/java/org/matsim/freight/logistics/HasLspShipmentId.java # src/main/java/org/matsim/freight/logistics/LSPControlerListener.java # src/main/java/org/matsim/freight/logistics/LSPRescheduler.java # src/main/java/org/matsim/freight/logistics/events/AbstractLspEvent.java # src/main/java/org/matsim/freight/logistics/events/HandlingInHubStartsEvent.java # src/main/java/org/matsim/freight/logistics/events/HandlingInHubStartsEventCreator.java # src/main/java/org/matsim/freight/logistics/events/LspEventAttributes.java # src/main/java/org/matsim/freight/logistics/events/LspEventCreator.java # src/main/java/org/matsim/freight/logistics/events/LspEventCreatorUtils.java # src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleThreeChains.java # src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java # src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java # src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java # src/test/java/org/matsim/freight/logistics/lspMobsimTests/SecondReloadLSPMobsimTest.java # test/input/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain1/output_events.xml.gz # test/input/lspMobsimTests/CompleteLSPMobsimTest/output_events.xml.gz # test/input/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest/output_events.xml.gz # test/input/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz # test/input/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz # test/input/org/matsim/freight/logistics/lspMobsimTests/SecondReloadLSPMobsimTest/output_events.xml.gz
- Loading branch information
Showing
216 changed files
with
2,515 additions
and
2,549 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/java/lsp/HasBackpointer.java → ...sim/freight/logistics/HasBackpointer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/java/lsp/HasSimulationTrackers.java → ...ight/logistics/HasSimulationTrackers.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package lsp; | ||
| package org.matsim.freight.logistics; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
|
|
||
2 changes: 1 addition & 1 deletion
2
src/main/java/lsp/KnowsLSP.java → ...rg/matsim/freight/logistics/KnowsLSP.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package lsp; | ||
| package org.matsim.freight.logistics; | ||
|
|
||
| interface KnowsLSP { | ||
| void setLSP(LSP lsp); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/java/lsp/LSPConstants.java → ...atsim/freight/logistics/LSPConstants.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package lsp; | ||
| package org.matsim.freight.logistics; | ||
|
|
||
| public abstract class LSPConstants { | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/java/lsp/LSPDataObject.java → ...tsim/freight/logistics/LSPDataObject.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 55 additions & 55 deletions
110
src/main/java/lsp/LSPPlan.java → ...org/matsim/freight/logistics/LSPPlan.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,55 @@ | ||
| /* | ||
| * *********************************************************************** * | ||
| * * project: org.matsim.* | ||
| * * *********************************************************************** * | ||
| * * * | ||
| * * copyright : (C) 2022 by the members listed in the COPYING, * | ||
| * * LICENSE and WARRANTY file. * | ||
| * * email : info at matsim dot org * | ||
| * * * | ||
| * * *********************************************************************** * | ||
| * * * | ||
| * * This program is free software; you can redistribute it and/or modify * | ||
| * * it under the terms of the GNU General Public License as published by * | ||
| * * the Free Software Foundation; either version 2 of the License, or * | ||
| * * (at your option) any later version. * | ||
| * * See also COPYING, LICENSE and WARRANTY file * | ||
| * * * | ||
| * * *********************************************************************** | ||
| */ | ||
|
|
||
| package lsp; | ||
|
|
||
| import lsp.shipment.LSPShipment; | ||
| import lsp.shipment.ShipmentPlan; | ||
| import org.matsim.api.core.v01.population.BasicPlan; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * This interface has the following properties:<ul> | ||
| * <li> As a {@link BasicPlan} it has a score, so it can be used for evolutionary learning. kai, may'22 </li> | ||
| * <li> An {@link LSPShipment} is added via lspPlan#getAssigner().assignToSolution(shipment). The {@link ShipmentAssigner} assigns it deterministically to a {@link LogisticChain}. </li> | ||
| * </ul> | ||
| */ | ||
| public interface LSPPlan extends BasicPlan, KnowsLSP { | ||
|
|
||
| LSPPlan addLogisticChain(LogisticChain solution); | ||
|
|
||
| Collection<LogisticChain> getLogisticChains(); | ||
|
|
||
| /** | ||
| * yy My intuition would be to replace lspPlan#getAssigner().assignToSolution( shipment ) by lspPlan.addShipment( shipment ). kai, may'22 | ||
| */ | ||
| ShipmentAssigner getAssigner(); | ||
|
|
||
| LSPPlan setAssigner(ShipmentAssigner assigner); | ||
|
|
||
| Collection<ShipmentPlan> getShipmentPlans(); | ||
| LSPPlan addShipmentPlan(ShipmentPlan shipmentPlan); | ||
|
|
||
| String getType(); | ||
|
|
||
| void setType(final String type); | ||
|
|
||
| } | ||
| /* | ||
| * *********************************************************************** * | ||
| * * project: org.matsim.* | ||
| * * *********************************************************************** * | ||
| * * * | ||
| * * copyright : (C) 2022 by the members listed in the COPYING, * | ||
| * * LICENSE and WARRANTY file. * | ||
| * * email : info at matsim dot org * | ||
| * * * | ||
| * * *********************************************************************** * | ||
| * * * | ||
| * * This program is free software; you can redistribute it and/or modify * | ||
| * * it under the terms of the GNU General Public License as published by * | ||
| * * the Free Software Foundation; either version 2 of the License, or * | ||
| * * (at your option) any later version. * | ||
| * * See also COPYING, LICENSE and WARRANTY file * | ||
| * * * | ||
| * * *********************************************************************** | ||
| */ | ||
|
|
||
| package org.matsim.freight.logistics; | ||
|
|
||
| import org.matsim.freight.logistics.shipment.LSPShipment; | ||
| import org.matsim.freight.logistics.shipment.ShipmentPlan; | ||
| import org.matsim.api.core.v01.population.BasicPlan; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * This interface has the following properties:<ul> | ||
| * <li> As a {@link BasicPlan} it has a score, so it can be used for evolutionary learning. kai, may'22 </li> | ||
| * <li> An {@link LSPShipment} is added via lspPlan#getAssigner().assignToSolution(shipment). The {@link ShipmentAssigner} assigns it deterministically to a {@link LogisticChain}. </li> | ||
| * </ul> | ||
| */ | ||
| public interface LSPPlan extends BasicPlan, KnowsLSP { | ||
|
|
||
| LSPPlan addLogisticChain(LogisticChain solution); | ||
|
|
||
| Collection<LogisticChain> getLogisticChains(); | ||
|
|
||
| /** | ||
| * yy My intuition would be to replace lspPlan#getAssigner().assignToSolution( shipment ) by lspPlan.addShipment( shipment ). kai, may'22 | ||
| */ | ||
| ShipmentAssigner getAssigner(); | ||
|
|
||
| LSPPlan setAssigner(ShipmentAssigner assigner); | ||
|
|
||
| Collection<ShipmentPlan> getShipmentPlans(); | ||
| LSPPlan addShipmentPlan(ShipmentPlan shipmentPlan); | ||
|
|
||
| String getType(); | ||
|
|
||
| void setType(final String type); | ||
|
|
||
| } |
Oops, something went wrong.