Merge branch 'master' into SquareGridZoneSystemFaster

matsim-org · Nov 26, 2024 · 37ba3ee · 37ba3ee
2 parents 98e24e8 + 5cb44ba
commit 37ba3ee
Show file tree

Hide file tree

Showing 62 changed files with 105 additions and 104 deletions.
diff --git a/...matsim/contrib/freightreceiver/Order.java → ...va/org/matsim/freight/receiver/Order.java b/...matsim/contrib/freightreceiver/Order.java → ...va/org/matsim/freight/receiver/Order.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/.../contrib/freightreceiver/ProductType.java → .../matsim/freight/receiver/ProductType.java b/.../contrib/freightreceiver/ProductType.java → .../matsim/freight/receiver/ProductType.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Identifiable;

diff --git a/...sim/contrib/freightreceiver/Receiver.java → ...org/matsim/freight/receiver/Receiver.java b/...sim/contrib/freightreceiver/Receiver.java → ...org/matsim/freight/receiver/Receiver.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;

diff --git a/...ontrib/freightreceiver/ReceiverAgent.java → ...atsim/freight/receiver/ReceiverAgent.java b/...ontrib/freightreceiver/ReceiverAgent.java → ...atsim/freight/receiver/ReceiverAgent.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/.../freightreceiver/ReceiverConfigGroup.java → ...freight/receiver/ReceiverConfigGroup.java b/.../freightreceiver/ReceiverConfigGroup.java → ...freight/receiver/ReceiverConfigGroup.java
@@ -15,7 +15,7 @@
  *   See also COPYING, LICENSE and WARRANTY file                           *
  *                                                                         *
  * *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...htreceiver/ReceiverControlerListener.java → ...t/receiver/ReceiverControlerListener.java b/...htreceiver/ReceiverControlerListener.java → ...t/receiver/ReceiverControlerListener.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import com.google.inject.Inject;
 import org.apache.logging.log4j.LogManager;
@@ -29,8 +29,8 @@
 import org.matsim.freight.carriers.CarriersUtils;
 import org.matsim.freight.carriers.ScheduledTour;
 import org.matsim.freight.carriers.Tour;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
-import org.matsim.contrib.freightreceiver.replanning.ReceiverStrategyManager;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.replanning.ReceiverStrategyManager;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.events.*;
 import org.matsim.core.controler.listener.*;

diff --git a/...eightreceiver/ReceiverCostAllocation.java → ...ight/receiver/ReceiverCostAllocation.java b/...eightreceiver/ReceiverCostAllocation.java → ...ight/receiver/ReceiverCostAllocation.java
@@ -18,7 +18,7 @@
  * ***********************************************************************
  */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.freight.carriers.Carrier;
 

diff --git a/...eceiverCostAllocationEqualProportion.java → ...eceiverCostAllocationEqualProportion.java b/...eceiverCostAllocationEqualProportion.java → ...eceiverCostAllocationEqualProportion.java
@@ -18,7 +18,7 @@
  * ***********************************************************************
  */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import com.google.inject.Inject;
 import org.matsim.api.core.v01.Id;

diff --git a/...receiver/ReceiverCostAllocationFixed.java → ...receiver/ReceiverCostAllocationFixed.java b/...receiver/ReceiverCostAllocationFixed.java → ...receiver/ReceiverCostAllocationFixed.java
@@ -17,7 +17,7 @@
  * *
  * ***********************************************************************
  */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.matsim.freight.carriers.Carrier;

diff --git a/...treceiver/ReceiverCostAllocationType.java → .../receiver/ReceiverCostAllocationType.java b/...treceiver/ReceiverCostAllocationType.java → .../receiver/ReceiverCostAllocationType.java
@@ -18,7 +18,7 @@
  * ***********************************************************************
  */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 /**
  * The supported ways in which the carrier's cost is spread among the receivers.

diff --git a/...contrib/freightreceiver/ReceiverImpl.java → ...matsim/freight/receiver/ReceiverImpl.java b/...contrib/freightreceiver/ReceiverImpl.java → ...matsim/freight/receiver/ReceiverImpl.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

diff --git a/...ntrib/freightreceiver/ReceiverModule.java → ...tsim/freight/receiver/ReceiverModule.java b/...ntrib/freightreceiver/ReceiverModule.java → ...tsim/freight/receiver/ReceiverModule.java
@@ -16,14 +16,15 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.matsim.freight.carriers.Carrier;
-import org.matsim.contrib.freightreceiver.replanning.*;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.AbstractModule;
+import org.matsim.freight.receiver.replanning.ReceiverReplanningUtils;
+import org.matsim.freight.receiver.replanning.ReceiverStrategyManager;
 
 public final class ReceiverModule extends AbstractModule {
     final private static Logger LOG = LogManager.getLogger(ReceiverModule.class);

diff --git a/...ontrib/freightreceiver/ReceiverOrder.java → ...atsim/freight/receiver/ReceiverOrder.java b/...ontrib/freightreceiver/ReceiverOrder.java → ...atsim/freight/receiver/ReceiverOrder.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

diff --git a/...contrib/freightreceiver/ReceiverPlan.java → ...matsim/freight/receiver/ReceiverPlan.java b/...contrib/freightreceiver/ReceiverPlan.java → ...matsim/freight/receiver/ReceiverPlan.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -25,7 +25,7 @@
 import org.matsim.api.core.v01.population.Person;
 import org.matsim.freight.carriers.Carrier;
 import org.matsim.freight.carriers.TimeWindow;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
 import org.matsim.utils.objectattributes.attributable.Attributable;
 import org.matsim.utils.objectattributes.attributable.Attributes;
 import org.matsim.utils.objectattributes.attributable.AttributesImpl;

diff --git a/...trib/freightreceiver/ReceiverProduct.java → ...sim/freight/receiver/ReceiverProduct.java b/...trib/freightreceiver/ReceiverProduct.java → ...sim/freight/receiver/ReceiverProduct.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 /**
  * Returns a new instance of a receiver product with associated information,

diff --git a/...eightreceiver/ReceiverReplanningType.java → ...ight/receiver/ReceiverReplanningType.java b/...eightreceiver/ReceiverReplanningType.java → ...ight/receiver/ReceiverReplanningType.java
@@ -15,7 +15,7 @@
  *   See also COPYING, LICENSE and WARRANTY file                           *
  *                                                                         *
  * *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 public enum ReceiverReplanningType {
     serviceTime, timeWindow, orderFrequency, afterHoursTimeWindow

diff --git a/...b/freightreceiver/ReceiverScoreStats.java → .../freight/receiver/ReceiverScoreStats.java b/...b/freightreceiver/ReceiverScoreStats.java → .../freight/receiver/ReceiverScoreStats.java
@@ -1,11 +1,11 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import com.google.inject.Inject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.freight.carriers.CarriersUtils;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.events.IterationEndsEvent;
 import org.matsim.core.controler.events.ShutdownEvent;

diff --git a/...eiver/ReceiverScoringFunctionFactory.java → ...eiver/ReceiverScoringFunctionFactory.java b/...eiver/ReceiverScoringFunctionFactory.java → ...eiver/ReceiverScoringFunctionFactory.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.core.scoring.ScoringFunction;
 

diff --git a/...eiverScoringFunctionFactoryMoneyOnly.java → ...eiverScoringFunctionFactoryMoneyOnly.java b/...eiverScoringFunctionFactoryMoneyOnly.java → ...eiverScoringFunctionFactoryMoneyOnly.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.matsim.core.scoring.ScoringFunction;

diff --git a/...trib/freightreceiver/ReceiverTracker.java → ...sim/freight/receiver/ReceiverTracker.java b/...trib/freightreceiver/ReceiverTracker.java → ...sim/freight/receiver/ReceiverTracker.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;

diff --git a/...verTriggersCarrierReplanningListener.java → ...verTriggersCarrierReplanningListener.java b/...verTriggersCarrierReplanningListener.java → ...verTriggersCarrierReplanningListener.java
@@ -15,7 +15,7 @@
  *   See also COPYING, LICENSE and WARRANTY file                           *
  *                                                                         *
  * *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm;
 import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem;
@@ -29,7 +29,7 @@
 import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
 import org.matsim.freight.carriers.jsprit.NetworkRouter;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.events.IterationStartsEvent;
 import org.matsim.core.controler.listener.IterationStartsListener;

diff --git a/...ontrib/freightreceiver/ReceiverUtils.java → ...atsim/freight/receiver/ReceiverUtils.java b/...ontrib/freightreceiver/ReceiverUtils.java → ...atsim/freight/receiver/ReceiverUtils.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...im/contrib/freightreceiver/Receivers.java → ...rg/matsim/freight/receiver/Receivers.java b/...im/contrib/freightreceiver/Receivers.java → ...rg/matsim/freight/receiver/Receivers.java
@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...trib/freightreceiver/ReceiversReader.java → ...sim/freight/receiver/ReceiversReader.java b/...trib/freightreceiver/ReceiversReader.java → ...sim/freight/receiver/ReceiversReader.java
@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.core.utils.io.MatsimXmlParser;
 import org.xml.sax.Attributes;

diff --git a/...ib/freightreceiver/ReceiversReaderV2.java → ...m/freight/receiver/ReceiversReaderV2.java b/...ib/freightreceiver/ReceiversReaderV2.java → ...m/freight/receiver/ReceiversReaderV2.java
@@ -18,13 +18,13 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.freight.carriers.Carrier;
 import org.matsim.freight.carriers.TimeWindow;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
 import org.matsim.core.api.internal.MatsimReader;
 import org.matsim.core.utils.io.MatsimXmlParser;
 import org.matsim.core.utils.misc.Counter;

diff --git a/...trib/freightreceiver/ReceiversWriter.java → ...sim/freight/receiver/ReceiversWriter.java b/...trib/freightreceiver/ReceiversWriter.java → ...sim/freight/receiver/ReceiversWriter.java
@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

diff --git a/...eightreceiver/ReceiversWriterHandler.java → ...ight/receiver/ReceiversWriterHandler.java b/...eightreceiver/ReceiversWriterHandler.java → ...ight/receiver/ReceiversWriterHandler.java
@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.freight.carriers.TimeWindow;
 import java.io.BufferedWriter;

diff --git a/...eceiver/ReceiversWriterHandlerImplV1.java → ...eceiver/ReceiversWriterHandlerImplV1.java b/...eceiver/ReceiversWriterHandlerImplV1.java → ...eceiver/ReceiversWriterHandlerImplV1.java
@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.freight.carriers.TimeWindow;
 import org.matsim.core.utils.misc.Time;

diff --git a/...eceiver/ReceiversWriterHandlerImplV2.java → ...eceiver/ReceiversWriterHandlerImplV2.java b/...eceiver/ReceiversWriterHandlerImplV2.java → ...eceiver/ReceiversWriterHandlerImplV2.java
@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.freight.carriers.TimeWindow;
 import org.matsim.core.utils.misc.Time;

diff --git a/...ontrib/freightreceiver/ReorderPolicy.java → ...atsim/freight/receiver/ReorderPolicy.java b/...ontrib/freightreceiver/ReorderPolicy.java → ...atsim/freight/receiver/ReorderPolicy.java
@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.utils.objectattributes.attributable.Attributable;
 

diff --git a/...trib/freightreceiver/SSReorderPolicy.java → ...sim/freight/receiver/SSReorderPolicy.java b/...trib/freightreceiver/SSReorderPolicy.java → ...sim/freight/receiver/SSReorderPolicy.java
@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.utils.objectattributes.attributable.Attributes;
 import org.matsim.utils.objectattributes.attributable.AttributesImpl;

diff --git a/...secasesCarrierScoringFunctionFactory.java → ...secasesCarrierScoringFunctionFactory.java b/...secasesCarrierScoringFunctionFactory.java → ...secasesCarrierScoringFunctionFactory.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

diff --git a/...ightreceiver/collaboration/Coalition.java → ...ght/receiver/collaboration/Coalition.java b/...ightreceiver/collaboration/Coalition.java → ...ght/receiver/collaboration/Coalition.java
@@ -1,7 +1,7 @@
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
 
 import org.matsim.freight.carriers.Carrier;
-import org.matsim.contrib.freightreceiver.Receiver;
+import org.matsim.freight.receiver.Receiver;
 import org.matsim.utils.objectattributes.attributable.Attributable;
 
 import java.util.Collection;

diff --git a/...ver/collaboration/CollaborationUtils.java → ...ver/collaboration/CollaborationUtils.java b/...ver/collaboration/CollaborationUtils.java → ...ver/collaboration/CollaborationUtils.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -7,7 +7,7 @@
 import org.matsim.freight.carriers.Carrier;
 import org.matsim.freight.carriers.CarriersUtils;
 import org.matsim.freight.carriers.Carriers;
-import org.matsim.contrib.freightreceiver.*;
+import org.matsim.freight.receiver.*;
 
 public class CollaborationUtils{
 	private CollaborationUtils(){} // do not instantiate

diff --git a/.../collaboration/CollaborationUtilsNew.java → .../collaboration/CollaborationUtilsNew.java b/.../collaboration/CollaborationUtilsNew.java → .../collaboration/CollaborationUtilsNew.java
@@ -1,7 +1,7 @@
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
 
 import org.matsim.freight.carriers.Carriers;
-import org.matsim.contrib.freightreceiver.*;
+import org.matsim.freight.receiver.Receivers;
 
 /**
  * Class with utilities to handle the collaboration between {@link Carriers}

diff --git a/...eiver/collaboration/MutableCoalition.java → ...eiver/collaboration/MutableCoalition.java b/...eiver/collaboration/MutableCoalition.java → ...eiver/collaboration/MutableCoalition.java
@@ -1,8 +1,8 @@
 
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
 
 import org.matsim.freight.carriers.Carrier;
-import org.matsim.contrib.freightreceiver.Receiver;
+import org.matsim.freight.receiver.Receiver;
 import org.matsim.utils.objectattributes.attributable.Attributes;
 import org.matsim.utils.objectattributes.attributable.AttributesImpl;
 

diff --git a/...eiver/collaboration/OrderSizeMutator.java → ...eiver/collaboration/OrderSizeMutator.java b/...eiver/collaboration/OrderSizeMutator.java → ...eiver/collaboration/OrderSizeMutator.java
@@ -16,11 +16,11 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
 
-import org.matsim.contrib.freightreceiver.Order;
-import org.matsim.contrib.freightreceiver.ReceiverOrder;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.Order;
+import org.matsim.freight.receiver.ReceiverOrder;
+import org.matsim.freight.receiver.ReceiverPlan;
 import org.matsim.core.gbl.MatsimRandom;
 import org.matsim.core.replanning.ReplanningContext;
 import org.matsim.core.replanning.modules.GenericPlanStrategyModule;