Merge pull request #161 from matsim-vsp/kmt_reorganize_packages

Reorganize package structure

src/main/java/lsp/ForwardLogisticChainSchedulerImpl.java → src/main/java/org/matsim/freight/logistics/ForwardLogisticChainSchedulerImpl.java

@@ -18,9 +18,9 @@
  *  * ***********************************************************************
  */
 
-package lsp;
+package org.matsim.freight.logistics;
 
-import lsp.shipment.LSPShipment;
+import org.matsim.freight.logistics.shipment.LSPShipment;
 import org.matsim.api.core.v01.Id;
 
 import java.util.ArrayList;

src/main/java/lsp/HasBackpointer.java → src/main/java/org/matsim/freight/logistics/HasBackpointer.java

@@ -1,4 +1,4 @@
-package lsp;
+package org.matsim.freight.logistics;
 
 @SuppressWarnings("InterfaceMayBeAnnotatedFunctional")
 public interface HasBackpointer<T> {

src/main/java/lsp/HasSimulationTrackers.java → src/main/java/org/matsim/freight/logistics/HasSimulationTrackers.java

@@ -1,4 +1,4 @@
-package lsp;
+package org.matsim.freight.logistics;
 
 import java.util.Collection;
 

src/main/java/lsp/KnowsLSP.java → src/main/java/org/matsim/freight/logistics/KnowsLSP.java

@@ -1,4 +1,4 @@
-package lsp;
+package org.matsim.freight.logistics;
 
 interface KnowsLSP {
 	void setLSP(LSP lsp);

src/main/java/lsp/LSP.java → src/main/java/org/matsim/freight/logistics/LSP.java

@@ -18,9 +18,9 @@
  *  * ***********************************************************************
  */
 
-package lsp;
+package org.matsim.freight.logistics;
 
-import lsp.shipment.LSPShipment;
+import org.matsim.freight.logistics.shipment.LSPShipment;
 import org.matsim.api.core.v01.population.HasPlansAndId;
 
 import java.util.Collection;

src/main/java/lsp/LSPCarrierResource.java → src/main/java/org/matsim/freight/logistics/LSPCarrierResource.java

@@ -18,7 +18,7 @@
  *  * ***********************************************************************
  */
 
-package lsp;
+package org.matsim.freight.logistics;
 
 import org.matsim.freight.carriers.Carrier;
 

src/main/java/lsp/LSPConstants.java → src/main/java/org/matsim/freight/logistics/LSPConstants.java

@@ -1,4 +1,4 @@
-package lsp;
+package org.matsim.freight.logistics;
 
 public abstract class LSPConstants {
 

src/main/java/lsp/LSPControlerListener.java → src/main/java/org/matsim/freight/logistics/LSPControlerListener.java

@@ -18,12 +18,12 @@
  *  * ***********************************************************************
  */
 
-package lsp;
+package org.matsim.freight.logistics;
 
 
 import jakarta.inject.Inject;
-import lsp.io.LSPPlanXmlWriter;
-import lsp.shipment.LSPShipment;
+import org.matsim.freight.logistics.io.LSPPlanXmlWriter;
+import org.matsim.freight.logistics.shipment.LSPShipment;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Scenario;

src/main/java/lsp/LSPDataObject.java → src/main/java/org/matsim/freight/logistics/LSPDataObject.java

@@ -1,4 +1,4 @@
-package lsp;
+package org.matsim.freight.logistics;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Identifiable;

src/main/java/lsp/LSPImpl.java → src/main/java/org/matsim/freight/logistics/LSPImpl.java

@@ -18,9 +18,9 @@
  *  * ***********************************************************************
  */
 
-package lsp;
+package org.matsim.freight.logistics;
 
-import lsp.shipment.LSPShipment;
+import org.matsim.freight.logistics.shipment.LSPShipment;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/lsp/LSPModule.java → src/main/java/org/matsim/freight/logistics/LSPModule.java

@@ -18,7 +18,7 @@
  *  * ***********************************************************************
  */
 
-package lsp;
+package org.matsim.freight.logistics;
 
 import com.google.inject.Provides;
 import jakarta.inject.Inject;

src/main/java/lsp/LSPPlan.java → src/main/java/org/matsim/freight/logistics/LSPPlan.java

@@ -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);
+
+}