move stuff from package "carrier" on level up.

matsim-org · Oct 11, 2023 · cefd2b8 · cefd2b8
1 parent e214b11
commit cefd2b8
Show file tree

Hide file tree

Showing 145 changed files with 286 additions and 283 deletions.
diff --git a/...rib/freight/carriers/carrier/Carrier.java → ...sim/contrib/freight/carriers/Carrier.java b/...rib/freight/carriers/carrier/Carrier.java → ...sim/contrib/freight/carriers/Carrier.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...carriers/carrier/CarrierCapabilities.java → ...freight/carriers/CarrierCapabilities.java b/...carriers/carrier/CarrierCapabilities.java → ...freight/carriers/CarrierCapabilities.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.*;
 

diff --git a/...ht/carriers/carrier/CarrierConstants.java → ...ib/freight/carriers/CarrierConstants.java b/...ht/carriers/carrier/CarrierConstants.java → ...ib/freight/carriers/CarrierConstants.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 public class CarrierConstants {
 

diff --git a/...freight/carriers/carrier/CarrierImpl.java → ...contrib/freight/carriers/CarrierImpl.java b/...freight/carriers/carrier/CarrierImpl.java → ...contrib/freight/carriers/CarrierImpl.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

diff --git a/...freight/carriers/carrier/CarrierPlan.java → ...contrib/freight/carriers/CarrierPlan.java b/...freight/carriers/carrier/CarrierPlan.java → ...contrib/freight/carriers/CarrierPlan.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.Collection;
 import org.matsim.api.core.v01.population.BasicPlan;

diff --git a/...carriers/carrier/CarrierPlanReaderV1.java → ...freight/carriers/CarrierPlanReaderV1.java b/...carriers/carrier/CarrierPlanReaderV1.java → ...freight/carriers/CarrierPlanReaderV1.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...t/carriers/carrier/CarrierPlanWriter.java → ...b/freight/carriers/CarrierPlanWriter.java b/...t/carriers/carrier/CarrierPlanWriter.java → ...b/freight/carriers/CarrierPlanWriter.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import com.google.inject.Inject;
 import org.matsim.utils.objectattributes.AttributeConverter;

diff --git a/...riers/carrier/CarrierPlanXmlParserV2.java → ...ight/carriers/CarrierPlanXmlParserV2.java b/...riers/carrier/CarrierPlanXmlParserV2.java → ...ight/carriers/CarrierPlanXmlParserV2.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,8 +33,8 @@
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
-import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.Builder;
-import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize;
+import org.matsim.contrib.freight.carriers.CarrierCapabilities.Builder;
+import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.gbl.Gbl;
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.population.routes.NetworkRoute;
@@ -45,7 +45,7 @@
 import org.matsim.utils.objectattributes.attributable.AttributesXmlReaderDelegate;
 import org.matsim.vehicles.*;
 import org.xml.sax.Attributes;
-import static org.matsim.contrib.freight.carriers.carrier.CarrierConstants.*;
+import static org.matsim.contrib.freight.carriers.CarrierConstants.*;
 
 class CarrierPlanXmlParserV2 extends MatsimXmlParser {
 

diff --git a/...ers/carrier/CarrierPlanXmlParserV2_1.java → ...ht/carriers/CarrierPlanXmlParserV2_1.java b/...ers/carrier/CarrierPlanXmlParserV2_1.java → ...ht/carriers/CarrierPlanXmlParserV2_1.java
@@ -19,15 +19,15 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import com.google.inject.Inject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
-import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.Builder;
-import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize;
+import org.matsim.contrib.freight.carriers.CarrierCapabilities.Builder;
+import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.gbl.Gbl;
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.population.routes.NetworkRoute;
@@ -42,7 +42,7 @@
 
 import java.util.*;
 
-import static org.matsim.contrib.freight.carriers.carrier.CarrierConstants.*;
+import static org.matsim.contrib.freight.carriers.CarrierConstants.*;
 
 class CarrierPlanXmlParserV2_1 extends MatsimXmlParser {
 

diff --git a/...arriers/carrier/CarrierPlanXmlReader.java → ...reight/carriers/CarrierPlanXmlReader.java b/...arriers/carrier/CarrierPlanXmlReader.java → ...reight/carriers/CarrierPlanXmlReader.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...riers/carrier/CarrierPlanXmlWriterV1.java → ...ight/carriers/CarrierPlanXmlWriterV1.java b/...riers/carrier/CarrierPlanXmlWriterV1.java → ...ight/carriers/CarrierPlanXmlWriterV1.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.io.BufferedWriter;
 import java.io.IOException;

diff --git a/...riers/carrier/CarrierPlanXmlWriterV2.java → ...ight/carriers/CarrierPlanXmlWriterV2.java b/...riers/carrier/CarrierPlanXmlWriterV2.java → ...ight/carriers/CarrierPlanXmlWriterV2.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.io.BufferedWriter;
 import java.io.IOException;

diff --git a/...ers/carrier/CarrierPlanXmlWriterV2_1.java → ...ht/carriers/CarrierPlanXmlWriterV2_1.java b/...ers/carrier/CarrierPlanXmlWriterV2_1.java → ...ht/carriers/CarrierPlanXmlWriterV2_1.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import com.google.inject.Inject;
 import org.apache.logging.log4j.LogManager;
@@ -39,7 +39,7 @@
 import java.io.IOException;
 import java.util.*;
 
-import static org.matsim.contrib.freight.carriers.carrier.CarrierConstants.*;
+import static org.matsim.contrib.freight.carriers.CarrierConstants.*;
 
 /**
  * A writer that writes carriers and their plans in a xml-file.

diff --git a/...ight/carriers/carrier/CarrierService.java → ...trib/freight/carriers/CarrierService.java b/...ight/carriers/carrier/CarrierService.java → ...trib/freight/carriers/CarrierService.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;

diff --git a/...ght/carriers/carrier/CarrierShipment.java → ...rib/freight/carriers/CarrierShipment.java b/...ght/carriers/carrier/CarrierShipment.java → ...rib/freight/carriers/CarrierShipment.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;

diff --git a/...reight/carriers/carrier/CarrierUtils.java → ...ontrib/freight/carriers/CarrierUtils.java b/...reight/carriers/carrier/CarrierUtils.java → ...ontrib/freight/carriers/CarrierUtils.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import com.graphhopper.jsprit.analysis.toolbox.StopWatch;
 import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm;
@@ -34,7 +34,6 @@
 import org.matsim.api.core.v01.TransportMode;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.population.Plan;
-import org.matsim.contrib.freight.carriers.FreightConfigGroup;
 import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory;
 import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts;
 import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter;

diff --git a/...ight/carriers/carrier/CarrierVehicle.java → ...trib/freight/carriers/CarrierVehicle.java b/...ight/carriers/carrier/CarrierVehicle.java → ...trib/freight/carriers/CarrierVehicle.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/.../carriers/carrier/CarrierVehicleType.java → .../freight/carriers/CarrierVehicleType.java b/.../carriers/carrier/CarrierVehicleType.java → .../freight/carriers/CarrierVehicleType.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.vehicles.VehicleType;

diff --git a/...ers/carrier/CarrierVehicleTypeLoader.java → ...ht/carriers/CarrierVehicleTypeLoader.java b/...ers/carrier/CarrierVehicleTypeLoader.java → ...ht/carriers/CarrierVehicleTypeLoader.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...ers/carrier/CarrierVehicleTypeReader.java → ...ht/carriers/CarrierVehicleTypeReader.java b/...ers/carrier/CarrierVehicleTypeReader.java → ...ht/carriers/CarrierVehicleTypeReader.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...s/carrier/CarrierVehicleTypeReaderV1.java → .../carriers/CarrierVehicleTypeReaderV1.java b/...s/carrier/CarrierVehicleTypeReaderV1.java → .../carriers/CarrierVehicleTypeReaderV1.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...ers/carrier/CarrierVehicleTypeWriter.java → ...ht/carriers/CarrierVehicleTypeWriter.java b/...ers/carrier/CarrierVehicleTypeWriter.java → ...ht/carriers/CarrierVehicleTypeWriter.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.core.api.internal.MatsimWriter;

diff --git a/...s/carrier/CarrierVehicleTypeWriterV1.java → .../carriers/CarrierVehicleTypeWriterV1.java b/...s/carrier/CarrierVehicleTypeWriterV1.java → .../carriers/CarrierVehicleTypeWriterV1.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...carriers/carrier/CarrierVehicleTypes.java → ...freight/carriers/CarrierVehicleTypes.java b/...carriers/carrier/CarrierVehicleTypes.java → ...freight/carriers/CarrierVehicleTypes.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ib/freight/carriers/carrier/Carriers.java → ...im/contrib/freight/carriers/Carriers.java b/...ib/freight/carriers/carrier/Carriers.java → ...im/contrib/freight/carriers/Carriers.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;

diff --git a/...eight/carriers/carrier/ScheduledTour.java → ...ntrib/freight/carriers/ScheduledTour.java b/...eight/carriers/carrier/ScheduledTour.java → ...ntrib/freight/carriers/ScheduledTour.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 
 /**

diff --git a/.../freight/carriers/carrier/TimeWindow.java → .../contrib/freight/carriers/TimeWindow.java b/.../freight/carriers/carrier/TimeWindow.java → .../contrib/freight/carriers/TimeWindow.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 
 import org.matsim.core.utils.misc.Time;

diff --git a/...ontrib/freight/carriers/carrier/Tour.java → ...matsim/contrib/freight/carriers/Tour.java b/...ontrib/freight/carriers/carrier/Tour.java → ...matsim/contrib/freight/carriers/Tour.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.matsim.contrib.freight.carriers.carrier;
+package org.matsim.contrib.freight.carriers;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...ibs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgent.java b/...ibs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgent.java
@@ -38,9 +38,9 @@
 import org.matsim.api.core.v01.population.Person;
 import org.matsim.api.core.v01.population.Plan;
 import org.matsim.api.core.v01.population.Route;
-import org.matsim.contrib.freight.carriers.carrier.*;
-import org.matsim.contrib.freight.carriers.carrier.Tour.TourActivity;
-import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement;
+import org.matsim.contrib.freight.carriers.*;
+import org.matsim.contrib.freight.carriers.Tour.TourActivity;
+import org.matsim.contrib.freight.carriers.Tour.TourElement;
 import org.matsim.contrib.freight.carriers.events.CarrierEventCreator;
 import org.matsim.core.api.experimental.events.EventsManager;
 import org.matsim.core.gbl.Gbl;

diff --git a/...ight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgentTracker.java b/...ight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgentTracker.java
@@ -27,8 +27,8 @@
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.events.*;
 import org.matsim.api.core.v01.population.Person;
-import org.matsim.contrib.freight.carriers.carrier.Carrier;
-import org.matsim.contrib.freight.carriers.carrier.Carriers;
+import org.matsim.contrib.freight.carriers.Carrier;
+import org.matsim.contrib.freight.carriers.Carriers;
 import org.matsim.contrib.freight.carriers.events.CarrierEventCreator;
 import org.matsim.contrib.freight.carriers.events.CarrierEventCreatorUtils;
 import org.matsim.core.api.experimental.events.EventsManager;

diff --git a/...src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierControlerListener.java b/...src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierControlerListener.java
@@ -24,7 +24,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freight.carriers.carrier.CarrierUtils;
+import org.matsim.contrib.freight.carriers.CarrierUtils;
 import org.matsim.core.controler.events.ReplanningEvent;
 import org.matsim.core.controler.events.ScoringEvent;
 import org.matsim.core.controler.listener.ReplanningListener;

diff --git a/...eight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierDriverAgent.java b/...eight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierDriverAgent.java
@@ -32,7 +32,7 @@
 import org.matsim.api.core.v01.population.Leg;
 import org.matsim.api.core.v01.population.Person;
 import org.matsim.api.core.v01.population.Route;
-import org.matsim.contrib.freight.carriers.carrier.*;
+import org.matsim.contrib.freight.carriers.*;
 import org.matsim.contrib.freight.carriers.events.CarrierEventCreator;
 import org.matsim.core.api.experimental.events.EventsManager;
 import org.matsim.core.population.PopulationUtils;

diff --git a/...bs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierModule.java b/...bs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierModule.java
@@ -28,8 +28,7 @@
 import org.matsim.api.core.v01.events.Event;
 import org.matsim.api.core.v01.population.Activity;
 import org.matsim.api.core.v01.population.Leg;
-import org.matsim.contrib.freight.carriers.FreightConfigGroup;
-import org.matsim.contrib.freight.carriers.carrier.*;
+import org.matsim.contrib.freight.carriers.*;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.AbstractModule;

diff --git a/...t/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierReRouteVehicles.java b/...t/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierReRouteVehicles.java
@@ -24,8 +24,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.carrier.CarrierPlan;
-import org.matsim.contrib.freight.carriers.carrier.ScheduledTour;
+import org.matsim.contrib.freight.carriers.CarrierPlan;
+import org.matsim.contrib.freight.carriers.ScheduledTour;
 import org.matsim.core.gbl.MatsimRandom;
 import org.matsim.core.replanning.ReplanningContext;
 import org.matsim.core.replanning.modules.GenericPlanStrategyModule;

diff --git a/...ain/java/org/matsim/contrib/freight/carriers/controler/CarrierScoringFunctionFactory.java b/...ain/java/org/matsim/contrib/freight/carriers/controler/CarrierScoringFunctionFactory.java
@@ -21,7 +21,7 @@
 
 package org.matsim.contrib.freight.carriers.controler;
 
-import org.matsim.contrib.freight.carriers.carrier.Carrier;
+import org.matsim.contrib.freight.carriers.Carrier;
 import org.matsim.core.scoring.ScoringFunction;
 
 public interface CarrierScoringFunctionFactory {

diff --git a/...t/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManager.java b/...t/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManager.java
@@ -22,8 +22,8 @@
 package org.matsim.contrib.freight.carriers.controler;
 
 import com.google.inject.Provider;
-import org.matsim.contrib.freight.carriers.carrier.Carrier;
-import org.matsim.contrib.freight.carriers.carrier.CarrierPlan;
+import org.matsim.contrib.freight.carriers.Carrier;
+import org.matsim.contrib.freight.carriers.CarrierPlan;
 import org.matsim.core.replanning.GenericStrategyManager;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
      *
      */
-    package org.matsim.contrib.freight.carriers.carrier;
+    package org.matsim.contrib.freight.carriers;
     import java.util.*;
@@ Expand Down @@