diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Carrier.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/Carrier.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Carrier.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/Carrier.java index 211fc942300..e73864b3aaa 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Carrier.java +++ b/contribs/freight/src/main/java/org/matsim/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierCapabilities.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierCapabilities.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierCapabilities.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierCapabilities.java index a46d5de24cb..0b6855095d2 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierCapabilities.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierConstants.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierConstants.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierConstants.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierConstants.java index 30594a277d6..6eb35a986f0 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierConstants.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierImpl.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierImpl.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierImpl.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierImpl.java index 19d0af8d1a3..129ffd11f4e 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierImpl.java +++ b/contribs/freight/src/main/java/org/matsim/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlan.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlan.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlan.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlan.java index 34666786077..899d8708577 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlan.java +++ b/contribs/freight/src/main/java/org/matsim/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanReaderV1.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanReaderV1.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanReaderV1.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanReaderV1.java index 4fc1c5f2744..5816a5e1ed2 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanReaderV1.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanWriter.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanWriter.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanWriter.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanWriter.java index 097f610d41b..47c08b0fb24 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanWriter.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlParserV2.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlParserV2.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlParserV2.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlParserV2.java index 5e7c0dfb2a1..3289719449f 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlParserV2.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlParserV2_1.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlParserV2_1.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlParserV2_1.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlParserV2_1.java index 12947ecc942..27215373cb7 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlParserV2_1.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReader.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReader.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReader.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReader.java index b1bb686d59b..2c46a695a09 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReader.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV1.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV1.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV1.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV1.java index 8723eb17c48..2d8e2c23b41 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV1.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2.java index dde02e72082..47efd32d496 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2_1.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2_1.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2_1.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2_1.java index 91f1d8a4241..5d7605ef0b6 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2_1.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierService.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierService.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierService.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierService.java index 2f84fb024f4..2fc69d73fc8 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierService.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierShipment.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierShipment.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierShipment.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierShipment.java index f1dc44913ee..c7ec0eab4fc 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierShipment.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierUtils.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierUtils.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierUtils.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierUtils.java index 039d51170a1..ec79600778f 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierUtils.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicle.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicle.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicle.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicle.java index 33d6df171f1..dbaae3a2ede 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicle.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleType.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleType.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleType.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleType.java index 5ffc50e9bfb..40e67d0ac92 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleType.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeLoader.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeLoader.java similarity index 97% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeLoader.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeLoader.java index 3ff9fa0486b..6df5d9398e3 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeLoader.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReader.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeReader.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReader.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeReader.java index cb74cab55a1..ea56e6b45c4 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReader.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReaderV1.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeReaderV1.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReaderV1.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeReaderV1.java index bf878d11e96..3f975ff2e53 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReaderV1.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriter.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeWriter.java similarity index 97% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriter.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeWriter.java index e944e1561d6..4f05689328f 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriter.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriterV1.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeWriterV1.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriterV1.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeWriterV1.java index 36448cce363..0554ed63f5e 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriterV1.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypes.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypes.java similarity index 97% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypes.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypes.java index cb49fd9daa3..8292ab3866c 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypes.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Carriers.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/Carriers.java similarity index 97% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Carriers.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/Carriers.java index 5526e0c94a9..35845776840 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Carriers.java +++ b/contribs/freight/src/main/java/org/matsim/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/ScheduledTour.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/ScheduledTour.java similarity index 97% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/ScheduledTour.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/ScheduledTour.java index 06fbd25fac4..b8a06288c78 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/ScheduledTour.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/ScheduledTour.java @@ -19,7 +19,7 @@ * */ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; /** diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/TimeWindow.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/TimeWindow.java similarity index 98% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/TimeWindow.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/TimeWindow.java index 925e85c41c9..2abc2007a83 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/TimeWindow.java +++ b/contribs/freight/src/main/java/org/matsim/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Tour.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/Tour.java similarity index 99% rename from contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Tour.java rename to contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/Tour.java index ed0c10919ce..727d2ad9168 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/carrier/Tour.java +++ b/contribs/freight/src/main/java/org/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgent.java index cfc71bc39d5..a5a6fe810d5 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgent.java +++ b/contribs/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgentTracker.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgentTracker.java index 5ec0b1943b8..a7f7efdcc21 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierAgentTracker.java +++ b/contribs/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierControlerListener.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierControlerListener.java index 424e8b7b62b..51db52a5ea8 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierControlerListener.java +++ b/contribs/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierDriverAgent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierDriverAgent.java index 134a7281bd0..65e7919c87c 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierDriverAgent.java +++ b/contribs/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierModule.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierModule.java index bafa076c586..a551f3529d4 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierModule.java +++ b/contribs/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierReRouteVehicles.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierReRouteVehicles.java index 6e2fd74c6a5..51c92335846 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierReRouteVehicles.java +++ b/contribs/freight/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierScoringFunctionFactory.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierScoringFunctionFactory.java index 47c70542287..2de0db81890 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierScoringFunctionFactory.java +++ b/contribs/freight/src/main/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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManager.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManager.java index aea63f25902..790f179cb96 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManager.java +++ b/contribs/freight/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; /** diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManagerImpl.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManagerImpl.java index bfaab4a1202..ff146db2632 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManagerImpl.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierStrategyManagerImpl.java @@ -22,8 +22,8 @@ package org.matsim.contrib.freight.carriers.controler; import org.matsim.api.core.v01.population.HasPlansAndId; -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.GenericPlanStrategy; import org.matsim.core.replanning.GenericStrategyManager; import org.matsim.core.replanning.GenericStrategyManagerImpl; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAllocationMutator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAllocationMutator.java index 21f73faae35..cb09f988e37 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAllocationMutator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAllocationMutator.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Collection; -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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAndSpaceTourRouter.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAndSpaceTourRouter.java index 604ebcebbfe..bf1ab844066 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAndSpaceTourRouter.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierTimeAndSpaceTourRouter.java @@ -29,11 +29,11 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour.Leg; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.CarrierVehicle; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour.Leg; +import org.matsim.contrib.freight.carriers.Tour.TourActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.core.population.routes.NetworkRoute; import org.matsim.core.population.routes.RouteUtils; import org.matsim.core.router.util.LeastCostPathCalculator; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierVehicleReRouter.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierVehicleReRouter.java index b53cb07da57..0bd612dc9b5 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierVehicleReRouter.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/CarrierVehicleReRouter.java @@ -39,9 +39,9 @@ import com.graphhopper.jsprit.io.algorithm.VehicleRoutingAlgorithms; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlan; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierPlan; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory; import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts; import org.matsim.contrib.freight.carriers.jsprit.VehicleTypeDependentRoadPricingCalculator; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightActivity.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightActivity.java index f6c358e0439..0c167a8f8c1 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightActivity.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightActivity.java @@ -25,7 +25,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.core.utils.misc.OptionalTime; import org.matsim.facilities.ActivityFacility; import org.matsim.utils.objectattributes.attributable.Attributes; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightAgentSource.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightAgentSource.java index 9866e3eb10e..dc534dc9840 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightAgentSource.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/FreightAgentSource.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.population.Plan; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; +import org.matsim.contrib.freight.carriers.CarrierUtils; import org.matsim.core.mobsim.framework.AgentSource; import org.matsim.core.mobsim.framework.MobsimAgent; import org.matsim.core.mobsim.qsim.QSim; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/WithinDayActivityReScheduling.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/WithinDayActivityReScheduling.java index 9b219b5bbb2..31e0829086a 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/WithinDayActivityReScheduling.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/controler/WithinDayActivityReScheduling.java @@ -31,8 +31,8 @@ import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.Person; import org.matsim.api.core.v01.population.PlanElement; -import org.matsim.contrib.freight.carriers.carrier.Tour.Start; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourActivity; +import org.matsim.contrib.freight.carriers.Tour.Start; +import org.matsim.contrib.freight.carriers.Tour.TourActivity; import org.matsim.core.mobsim.framework.Mobsim; import org.matsim.core.mobsim.framework.MobsimAgent; import org.matsim.core.mobsim.framework.PlanAgent; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/AbstractCarrierEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/AbstractCarrierEvent.java index 6c36c5ce805..35550990947 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/AbstractCarrierEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/AbstractCarrierEvent.java @@ -26,7 +26,7 @@ import org.matsim.api.core.v01.events.HasLinkId; import org.matsim.api.core.v01.events.HasVehicleId; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.vehicles.Vehicle; import java.util.Map; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierEventCreator.java index 085bdbb9e06..ef081f739ac 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierEventCreator.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.ScheduledTour; import org.matsim.vehicles.Vehicle; public interface CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEvent.java index f7b3a5b3aac..ea94a5fe69f 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEvent.java @@ -26,8 +26,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; import org.matsim.vehicles.Vehicle; import static org.matsim.contrib.freight.carriers.events.CarrierEventAttributes.*; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEventCreator.java index bab8f4eda0e..4f159c69e11 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceEndEventCreator.java @@ -25,11 +25,11 @@ import org.matsim.api.core.v01.events.ActivityEndEvent; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.vehicles.Vehicle; /*package-private*/ final class CarrierServiceEndEventCreator implements CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEvent.java index 444d8b8a659..7fc0e0493a4 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEvent.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; import org.matsim.vehicles.Vehicle; import java.util.Map; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEventCreator.java index 12800889490..f4702af5cf4 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierServiceStartEventCreator.java @@ -25,11 +25,11 @@ import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.vehicles.Vehicle; /*package-private*/ final class CarrierServiceStartEventCreator implements CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEvent.java index 09be0faa0dd..f707defccfe 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEvent.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierShipment; import org.matsim.vehicles.Vehicle; import java.util.Map; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEventCreator.java index be6bcf3acf3..a8aa32eba53 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryEndEventCreator.java @@ -25,11 +25,11 @@ import org.matsim.api.core.v01.events.ActivityEndEvent; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour.Delivery; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour.Delivery; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.vehicles.Vehicle; /*package-private*/ final class CarrierShipmentDeliveryEndEventCreator implements CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEvent.java index dde81d61bc0..3c07ac9d90b 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEvent.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierShipment; import org.matsim.vehicles.Vehicle; import java.util.Map; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEventCreator.java index 8d90cc4187e..27f7e73f26b 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentDeliveryStartEventCreator.java @@ -25,11 +25,11 @@ import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour.Delivery; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour.Delivery; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.vehicles.Vehicle; /*package-private*/ final class CarrierShipmentDeliveryStartEventCreator implements CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEvent.java index 73d4500a189..16e27d8f64e 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEvent.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierShipment; import org.matsim.vehicles.Vehicle; import java.util.Map; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEventCreator.java index 26b1fc6d8e3..398c05512f7 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupEndEventCreator.java @@ -25,11 +25,11 @@ import org.matsim.api.core.v01.events.ActivityEndEvent; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour.Pickup; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour.Pickup; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.vehicles.Vehicle; /*package-private*/ final class CarrierShipmentPickupEndEventCreator implements CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEvent.java index cdacf80a238..2e46d457fc5 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEvent.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierShipment; import org.matsim.vehicles.Vehicle; import java.util.Map; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEventCreator.java index feeda7518cb..55e639f2d95 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierShipmentPickupStartEventCreator.java @@ -25,11 +25,11 @@ import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour.Pickup; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour.Pickup; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.vehicles.Vehicle; /*package-private*/ final class CarrierShipmentPickupStartEventCreator implements CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEvent.java index c68fc5d4c4c..60823221909 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEvent.java @@ -26,8 +26,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.Tour; import org.matsim.vehicles.Vehicle; import static org.matsim.contrib.freight.carriers.events.CarrierEventAttributes.ATTRIBUTE_TOUR_ID; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEventCreator.java index e3548fb737e..f8f8f7ed3f0 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourEndEventCreator.java @@ -25,9 +25,9 @@ import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; import org.matsim.vehicles.Vehicle; /*package-private*/ final class CarrierTourEndEventCreator implements CarrierEventCreator { diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEvent.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEvent.java index c9f6483730f..88e71a75b8e 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEvent.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEvent.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.GenericEvent; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.Tour; import org.matsim.vehicles.Vehicle; import java.util.Map; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEventCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEventCreator.java index 53175d23a76..7562fc9ca74 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEventCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/CarrierTourStartEventCreator.java @@ -27,9 +27,9 @@ import org.matsim.api.core.v01.events.PersonEntersVehicleEvent; import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.ScheduledTour; import org.matsim.vehicles.Vehicle; import java.util.TreeMap; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/HasCarrierId.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/HasCarrierId.java index 82357ca40e3..c8c22848694 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/HasCarrierId.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/HasCarrierId.java @@ -22,7 +22,7 @@ package org.matsim.contrib.freight.carriers.events; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; /** * @author Kai Martins-Turner (kturner) diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/eventhandler/Vehicle2CarrierEventHandler.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/eventhandler/Vehicle2CarrierEventHandler.java index 99e37a464f7..11ffbbf3a55 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/eventhandler/Vehicle2CarrierEventHandler.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/events/eventhandler/Vehicle2CarrierEventHandler.java @@ -21,7 +21,7 @@ package org.matsim.contrib.freight.carriers.events.eventhandler; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; import org.matsim.vehicles.Vehicle; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraint.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraint.java index 78d410cd3ed..efc5759c3c0 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraint.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraint.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; import org.matsim.vehicles.VehicleType; import org.matsim.vehicles.VehicleUtils; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/MatsimJspritFactory.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/MatsimJspritFactory.java index b555e5cc6e0..659bd4a0c25 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/MatsimJspritFactory.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/MatsimJspritFactory.java @@ -51,10 +51,9 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.Tour.Leg; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.Tour.Leg; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.core.utils.io.IOUtils; import org.matsim.vehicles.VehicleType; import org.matsim.vehicles.VehicleUtils; @@ -92,10 +91,10 @@ static CarrierShipment createCarrierShipment(Shipment jspritShipment) { Id.createLinkId(jspritShipment.getPickupLocation().getId()), Id.createLinkId(jspritShipment.getDeliveryLocation().getId()), jspritShipment.getSize().get(0)) .setDeliveryServiceTime(jspritShipment.getDeliveryServiceTime()) - .setDeliveryTimeWindow(org.matsim.contrib.freight.carriers.carrier.TimeWindow.newInstance(jspritShipment.getDeliveryTimeWindow().getStart(), + .setDeliveryTimeWindow(org.matsim.contrib.freight.carriers.TimeWindow.newInstance(jspritShipment.getDeliveryTimeWindow().getStart(), jspritShipment.getDeliveryTimeWindow().getEnd())) .setPickupServiceTime(jspritShipment.getPickupServiceTime()) - .setPickupTimeWindow(org.matsim.contrib.freight.carriers.carrier.TimeWindow.newInstance(jspritShipment.getPickupTimeWindow().getStart(), + .setPickupTimeWindow(org.matsim.contrib.freight.carriers.TimeWindow.newInstance(jspritShipment.getPickupTimeWindow().getStart(), jspritShipment.getPickupTimeWindow().getEnd())) .build(); CarrierUtils.setSkills(carrierShipment, jspritShipment.getRequiredSkills().values()); @@ -190,7 +189,7 @@ static CarrierService createCarrierService(Service jspritService) { serviceBuilder.setCapacityDemand(jspritService.getSize().get(0)); serviceBuilder.setServiceDuration(jspritService.getServiceDuration()); serviceBuilder.setServiceStartTimeWindow( - org.matsim.contrib.freight.carriers.carrier.TimeWindow.newInstance(jspritService.getTimeWindow().getStart(), jspritService.getTimeWindow().getEnd())); + org.matsim.contrib.freight.carriers.TimeWindow.newInstance(jspritService.getTimeWindow().getStart(), jspritService.getTimeWindow().getEnd())); CarrierService carrierService = serviceBuilder.build(); CarrierUtils.setSkills(carrierService, jspritService.getRequiredSkills().values()); return carrierService; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCosts.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCosts.java index 4d5e50cff5b..def2738a882 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCosts.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCosts.java @@ -30,7 +30,7 @@ import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; +import org.matsim.contrib.freight.carriers.CarrierVehicle; import org.matsim.core.router.speedy.SpeedyALTFactory; import org.matsim.core.router.util.LeastCostPathCalculator; import org.matsim.core.router.util.LeastCostPathCalculator.Path; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCostsFactory.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCostsFactory.java index 7ca90b40762..b1468d5516f 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCostsFactory.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkBasedTransportCostsFactory.java @@ -24,7 +24,7 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.TransportMode; import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.router.util.TravelTime; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkRouter.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkRouter.java index fa78319cb28..d596b5263d5 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkRouter.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/jsprit/NetworkRouter.java @@ -20,8 +20,8 @@ */ package org.matsim.contrib.freight.carriers.jsprit; -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.contrib.freight.carriers.controler.CarrierTimeAndSpaceTourRouter; /** diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/analysis/CarrierScoreStats.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/analysis/CarrierScoreStats.java index 1bd6df35c00..a7bb692d342 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/analysis/CarrierScoreStats.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/analysis/CarrierScoreStats.java @@ -23,9 +23,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlan; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierPlan; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.core.controler.events.IterationEndsEvent; import org.matsim.core.controler.events.ShutdownEvent; import org.matsim.core.controler.events.StartupEvent; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierScoringFunctionFactoryImpl.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierScoringFunctionFactoryImpl.java index 2abac638b4d..1485f38bfda 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierScoringFunctionFactoryImpl.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierScoringFunctionFactoryImpl.java @@ -31,7 +31,7 @@ import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.Leg; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.FreightActivity; import org.matsim.contrib.freight.carriers.jsprit.VehicleTypeDependentRoadPricingCalculator; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierTravelDisutilities.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierTravelDisutilities.java index b52d4f29fbf..ff48375692d 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierTravelDisutilities.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/CarrierTravelDisutilities.java @@ -24,7 +24,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; import org.matsim.contrib.freight.carriers.jsprit.VehicleTypeDependentRoadPricingCalculator; import org.matsim.core.router.util.TravelDisutility; import org.matsim.core.router.util.TravelTime; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/FreightScenarioCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/FreightScenarioCreator.java index 7e8cafc2387..83f87628064 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/FreightScenarioCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/FreightScenarioCreator.java @@ -25,8 +25,8 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/InitialCarrierPlanCreator.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/InitialCarrierPlanCreator.java index 9ca3a668e4d..d04e4dd2f5d 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/InitialCarrierPlanCreator.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/InitialCarrierPlanCreator.java @@ -39,7 +39,7 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; 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/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/PlotPlans.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/PlotPlans.java index 3efcb03dcb7..013e55ad640 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/PlotPlans.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/PlotPlans.java @@ -27,12 +27,12 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlanXmlReader; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypeLoader; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypeReader; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierPlanXmlReader; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypeLoader; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypeReader; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunChessboard.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunChessboard.java index 807283ba149..ca02b70ae39 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunChessboard.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunChessboard.java @@ -25,8 +25,7 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.TransportMode; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.*; import org.matsim.contrib.freight.carriers.usecases.analysis.CarrierScoreStats; import org.matsim.contrib.freight.carriers.usecases.analysis.LegHistogram; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunPassengerAlongWithCarriers.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunPassengerAlongWithCarriers.java index 53852b51482..9266d748671 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunPassengerAlongWithCarriers.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/RunPassengerAlongWithCarriers.java @@ -25,7 +25,7 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.TransportMode; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.*; import org.matsim.contrib.freight.carriers.usecases.analysis.CarrierScoreStats; import org.matsim.contrib.freight.carriers.usecases.analysis.LegHistogram; diff --git a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/SelectBestPlanAndOptimizeItsVehicleRouteFactory.java b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/SelectBestPlanAndOptimizeItsVehicleRouteFactory.java index b0ef746874b..4a459591681 100644 --- a/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/SelectBestPlanAndOptimizeItsVehicleRouteFactory.java +++ b/contribs/freight/src/main/java/org/matsim/contrib/freight/carriers/usecases/chessboard/SelectBestPlanAndOptimizeItsVehicleRouteFactory.java @@ -35,9 +35,9 @@ import com.graphhopper.jsprit.io.algorithm.VehicleRoutingAlgorithms; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlan; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierPlan; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; 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/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierModuleTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierModuleTest.java similarity index 98% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierModuleTest.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierModuleTest.java index 9a3316e569e..149452e6ef7 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierModuleTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierModuleTest.java @@ -16,12 +16,13 @@ * * * *********************************************************************** */ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Scenario; +import org.matsim.contrib.freight.carriers.CarrierUtils; import org.matsim.contrib.freight.carriers.FreightConfigGroup; import org.matsim.contrib.freight.carriers.controler.CarrierModule; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanReaderV1Test.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanReaderV1Test.java similarity index 97% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanReaderV1Test.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanReaderV1Test.java index 873b54ec7ca..0b8e7015395 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanReaderV1Test.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanReaderV1Test.java @@ -21,13 +21,14 @@ * */ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Tour.Leg; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.Tour.Leg; import org.matsim.core.population.routes.NetworkRoute; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.VehicleType; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReaderV2Test.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReaderV2Test.java similarity index 96% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReaderV2Test.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReaderV2Test.java index dfefb8dc9b2..70e50f1f815 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReaderV2Test.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReaderV2Test.java @@ -1,4 +1,4 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Assert; import org.junit.Before; @@ -7,7 +7,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.TransportMode; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.gbl.Gbl; @@ -147,7 +148,7 @@ public void test_CarrierHasAttributes(){ @Test public void test_ServicesAndShipmentsHaveAttributes(){ - Object serviceCustomerAtt = testCarrier.getServices().get(Id.create("serv1",CarrierService.class)).getAttributes().getAttribute("customer"); + Object serviceCustomerAtt = testCarrier.getServices().get(Id.create("serv1", CarrierService.class)).getAttributes().getAttribute("customer"); Assert.assertNotNull(serviceCustomerAtt); Assert.assertEquals("someRandomCustomer", serviceCustomerAtt); Object shipmentCustomerAtt = testCarrier.getShipments().get(Id.create("s1",CarrierShipment.class)).getAttributes().getAttribute("customer"); diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReaderV2WithDtdTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReaderV2WithDtdTest.java similarity index 96% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReaderV2WithDtdTest.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReaderV2WithDtdTest.java index 39f2dbfb12b..6e353548b9f 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlReaderV2WithDtdTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlReaderV2WithDtdTest.java @@ -1,4 +1,4 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Assert; import org.junit.Before; @@ -6,7 +6,8 @@ import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.gbl.Gbl; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.Vehicle; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV1Test.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV1Test.java similarity index 96% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV1Test.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV1Test.java index af32165186f..5148c42d5e8 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV1Test.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV1Test.java @@ -26,11 +26,12 @@ * ${type_declaration} */ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; +import org.matsim.contrib.freight.carriers.*; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.VehicleType; import org.matsim.vehicles.VehicleUtils; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2Test.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2Test.java similarity index 97% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2Test.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2Test.java index 8a6054d1dd2..5407d57a21f 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2Test.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2Test.java @@ -1,11 +1,12 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.TransportMode; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.Vehicle; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2_1Test.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2_1Test.java similarity index 97% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2_1Test.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2_1Test.java index 3e412fde521..09ad386a879 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierPlanXmlWriterV2_1Test.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierPlanXmlWriterV2_1Test.java @@ -1,11 +1,12 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.TransportMode; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.Vehicle; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierReadWriteV2_1Test.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierReadWriteV2_1Test.java similarity index 96% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierReadWriteV2_1Test.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierReadWriteV2_1Test.java index 4f1be0de74f..0c0de8dc1c2 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierReadWriteV2_1Test.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierReadWriteV2_1Test.java @@ -1,7 +1,8 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Rule; import org.junit.Test; +import org.matsim.contrib.freight.carriers.*; import org.matsim.testcases.MatsimTestUtils; import java.io.FileNotFoundException; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierUtilsTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierUtilsTest.java similarity index 98% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierUtilsTest.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierUtilsTest.java index c894bcd1989..8adc5cc8f25 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierUtilsTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierUtilsTest.java @@ -26,12 +26,13 @@ * ${type_declaration} */ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; +import org.matsim.contrib.freight.carriers.*; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.VehicleUtils; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeLoaderTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeLoaderTest.java similarity index 97% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeLoaderTest.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeLoaderTest.java index e23adb2f1ef..f0e6cc2fd20 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeLoaderTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeLoaderTest.java @@ -1,10 +1,11 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; +import org.matsim.contrib.freight.carriers.*; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.VehicleType; import org.matsim.vehicles.VehicleUtils; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReaderTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeReaderTest.java similarity index 98% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReaderTest.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeReaderTest.java index b27daef7f99..83ee915f598 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeReaderTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeReaderTest.java @@ -1,4 +1,4 @@ -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/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeTest.java similarity index 98% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeTest.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeTest.java index 4ae4f6f745a..45eb8b966a2 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeTest.java @@ -1,10 +1,11 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.*; import org.matsim.vehicles.EngineInformation.FuelType; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriterTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeWriterTest.java similarity index 72% rename from contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriterTest.java rename to contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeWriterTest.java index e4df997b1cd..5550988f32a 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/carrier/CarrierVehicleTypeWriterTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/CarrierVehicleTypeWriterTest.java @@ -1,7 +1,10 @@ -package org.matsim.contrib.freight.carriers.carrier; +package org.matsim.contrib.freight.carriers; import org.junit.Rule; import org.junit.Test; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypeReader; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypeWriter; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; import org.matsim.testcases.MatsimTestUtils; public class CarrierVehicleTypeWriterTest { diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java index 75a0a4d9cec..9ef24f3b3cd 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.mobsim.DistanceScoringFunctionFactoryForTests; import org.matsim.contrib.freight.carriers.mobsim.StrategyManagerFactoryForTests; import org.matsim.core.config.Config; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithoutPersonsIT.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithoutPersonsIT.java index 662c61aa59d..9eeff3e39a7 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithoutPersonsIT.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/controler/EquilWithCarrierWithoutPersonsIT.java @@ -26,10 +26,10 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour; import org.matsim.contrib.freight.carriers.mobsim.DistanceScoringFunctionFactoryForTests; import org.matsim.contrib.freight.carriers.mobsim.StrategyManagerFactoryForTests; import org.matsim.contrib.freight.carriers.mobsim.TimeScoringFunctionFactoryForTests; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintFromVehiclesFileTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintFromVehiclesFileTest.java index b0dfebd5167..6cb49f6aefb 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintFromVehiclesFileTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintFromVehiclesFileTest.java @@ -28,10 +28,9 @@ import org.junit.Test; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.FreightConfigGroup; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.FreightConfigGroup.UseDistanceConstraintForTourPlanning; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.ControlerConfigGroup.CompressionType; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintTest.java index b1f5d34d114..4acd6f87982 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/DistanceConstraintTest.java @@ -28,10 +28,9 @@ import org.junit.Test; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.FreightConfigGroup; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.FreightConfigGroup.UseDistanceConstraintForTourPlanning; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.ControlerConfigGroup.CompressionType; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/FixedCostsTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/FixedCostsTest.java index bf4476c08f0..e64b07ab8c7 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/FixedCostsTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/FixedCostsTest.java @@ -32,7 +32,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.core.network.NetworkUtils; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.utils.io.IOUtils; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/IntegrationIT.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/IntegrationIT.java index 2bfc5c8a8a4..4de1c12e4a8 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/IntegrationIT.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/IntegrationIT.java @@ -11,8 +11,7 @@ import org.junit.Test; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Network; -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.network.io.MatsimNetworkReader; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/MatsimTransformerTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/MatsimTransformerTest.java index cf90c7091d3..79382c14584 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/MatsimTransformerTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/MatsimTransformerTest.java @@ -27,8 +27,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.network.NetworkUtils; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.testcases.MatsimTestUtils; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/SkillsIT.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/SkillsIT.java index 2ac0b61189c..efded803728 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/SkillsIT.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/jsprit/SkillsIT.java @@ -29,7 +29,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.core.config.ConfigUtils; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/DistanceScoringFunctionFactoryForTests.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/DistanceScoringFunctionFactoryForTests.java index 094fa70eac3..cb308683943 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/DistanceScoringFunctionFactoryForTests.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/DistanceScoringFunctionFactoryForTests.java @@ -10,10 +10,10 @@ import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.Leg; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.CarrierVehicle; +import org.matsim.contrib.freight.carriers.CarrierConstants; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.core.gbl.Gbl; import org.matsim.core.population.routes.NetworkRoute; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/ScoringFunctionFactoryForTests.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/ScoringFunctionFactoryForTests.java index f8e080e8391..66ccbef86a8 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/ScoringFunctionFactoryForTests.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/ScoringFunctionFactoryForTests.java @@ -10,10 +10,10 @@ import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.Leg; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.CarrierVehicle; +import org.matsim.contrib.freight.carriers.CarrierConstants; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.core.gbl.Gbl; import org.matsim.core.population.routes.NetworkRoute; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/StrategyManagerFactoryForTests.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/StrategyManagerFactoryForTests.java index eb38eda3fc4..d7e5f4add09 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/StrategyManagerFactoryForTests.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/StrategyManagerFactoryForTests.java @@ -6,8 +6,8 @@ import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.population.Person; -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.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierReRouteVehicles; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/TimeScoringFunctionFactoryForTests.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/TimeScoringFunctionFactoryForTests.java index b7378cd3692..3bb8bfccba5 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/TimeScoringFunctionFactoryForTests.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/mobsim/TimeScoringFunctionFactoryForTests.java @@ -8,10 +8,10 @@ import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.Leg; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierConstants; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierConstants; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.CarrierVehicle; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.core.population.routes.NetworkRoute; import org.matsim.core.scoring.ScoringFunction; diff --git a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsIT.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsIT.java index 2afabcfc453..7246e090c89 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsIT.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsIT.java @@ -30,8 +30,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; 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/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsTest.java b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsTest.java index e84bc83e056..742cc3ccc31 100644 --- a/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsTest.java +++ b/contribs/freight/src/test/java/org/matsim/contrib/freight/carriers/utils/CarrierControlerUtilsTest.java @@ -33,9 +33,8 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; 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/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java index b56803c3a8e..2b566a5bcd3 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java @@ -22,9 +22,9 @@ import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.core.scoring.ScoringFunction; import java.util.ArrayList; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java index de88d2207e5..2b9f78d357f 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java @@ -25,10 +25,10 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.population.HasPlansAndId; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour; import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils; import org.matsim.contrib.freightreceiver.replanning.ReceiverStrategyManager; import org.matsim.core.config.ConfigUtils; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java index 0edfac1cf01..e54475e2a29 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java @@ -20,7 +20,7 @@ package org.matsim.contrib.freightreceiver; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; public interface ReceiverCostAllocation { double getScore(Carrier carrier, Receiver receiver); diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java index 61b581a5db0..bd5e8b17be5 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java @@ -23,7 +23,7 @@ import com.google.inject.Inject; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import java.util.*; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java index 2f4fb19cc2d..e0f0f7f59a0 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java @@ -20,7 +20,7 @@ package org.matsim.contrib.freightreceiver; import org.apache.logging.log4j.LogManager; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; /** * A simple implementation where the cost allocated by the {@link Carrier} to diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverModule.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverModule.java index f15f3456847..299f473e13c 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverModule.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverModule.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.contrib.freightreceiver.replanning.*; import org.matsim.core.config.ConfigUtils; import org.matsim.core.controler.AbstractModule; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverOrder.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverOrder.java index cae23e70acf..2a3a9f28927 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverOrder.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverOrder.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.LogManager; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.population.BasicPlan; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import java.util.ArrayList; import java.util.Collection; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverPlan.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverPlan.java index 1c5199b99fc..75517d932fd 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverPlan.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverPlan.java @@ -23,8 +23,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.population.BasicPlan; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils; import org.matsim.utils.objectattributes.attributable.Attributable; import org.matsim.utils.objectattributes.attributable.Attributes; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoreStats.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoreStats.java index f211d7c02ab..177052bd959 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoreStats.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoreStats.java @@ -4,7 +4,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.contrib.freightreceiver.collaboration.CollaborationUtils; import org.matsim.core.config.ConfigUtils; import org.matsim.core.controler.events.IterationEndsEvent; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java index 8f54ebb320f..e4fb234e314 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.LogManager; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; 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/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverUtils.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverUtils.java index 57c9b8e99cc..c4bd0e4bed6 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverUtils.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverUtils.java @@ -5,7 +5,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReaderV2.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReaderV2.java index f7a88458e67..3b113012b9e 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReaderV2.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReaderV2.java @@ -22,8 +22,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils; import org.matsim.core.api.internal.MatsimReader; import org.matsim.core.utils.io.MatsimXmlParser; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriter.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriter.java index 4e488abb3e3..2fdb7cd5fbb 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriter.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriter.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.core.api.internal.MatsimWriter; import org.matsim.core.utils.io.MatsimXmlWriter; import org.matsim.core.utils.io.UncheckedIOException; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandler.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandler.java index 33a91f0060b..ad89fd45be2 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandler.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandler.java @@ -20,7 +20,7 @@ package org.matsim.contrib.freightreceiver; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import java.io.BufferedWriter; import java.io.IOException; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV1.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV1.java index 702e6b7b3e1..9be64d1c341 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV1.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV1.java @@ -20,7 +20,7 @@ package org.matsim.contrib.freightreceiver; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.core.utils.misc.Time; import org.matsim.utils.objectattributes.attributable.Attributes; import org.matsim.utils.objectattributes.attributable.AttributesXmlWriterDelegate; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV2.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV2.java index 1399069f6ae..1d7b28d4b9f 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV2.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV2.java @@ -20,7 +20,7 @@ package org.matsim.contrib.freightreceiver; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.core.utils.misc.Time; import org.matsim.utils.objectattributes.attributable.Attributes; import org.matsim.utils.objectattributes.attributable.AttributesXmlWriterDelegate; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/UsecasesCarrierScoringFunctionFactory.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/UsecasesCarrierScoringFunctionFactory.java index 1d726372b0c..c30e0b4133e 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/UsecasesCarrierScoringFunctionFactory.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/UsecasesCarrierScoringFunctionFactory.java @@ -7,7 +7,7 @@ import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.Leg; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.FreightActivity; import org.matsim.core.population.routes.NetworkRoute; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/Coalition.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/Coalition.java index f94767179bd..7c6548a5b40 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/Coalition.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/Coalition.java @@ -1,6 +1,6 @@ package org.matsim.contrib.freightreceiver.collaboration; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.contrib.freightreceiver.Receiver; import org.matsim.utils.objectattributes.attributable.Attributable; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtils.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtils.java index 38aa919b3d4..f3cfec75fa5 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtils.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtils.java @@ -4,9 +4,9 @@ import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freightreceiver.*; public class CollaborationUtils{ diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtilsNew.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtilsNew.java index bb55d683ba0..aebeade94c2 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtilsNew.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtilsNew.java @@ -1,6 +1,6 @@ package org.matsim.contrib.freightreceiver.collaboration; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freightreceiver.*; /** diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/MutableCoalition.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/MutableCoalition.java index 4a85c754ef3..29452b22c45 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/MutableCoalition.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/MutableCoalition.java @@ -1,7 +1,7 @@ package org.matsim.contrib.freightreceiver.collaboration; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.contrib.freightreceiver.Receiver; import org.matsim.utils.objectattributes.attributable.Attributes; import org.matsim.utils.objectattributes.attributable.AttributesImpl; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/TimeWindowMutator.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/TimeWindowMutator.java index d0a9ceddb74..110b81f6824 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/TimeWindowMutator.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/TimeWindowMutator.java @@ -21,7 +21,7 @@ */ package org.matsim.contrib.freightreceiver.collaboration; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.contrib.freightreceiver.ReceiverPlan; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.replanning.ReplanningContext; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowUpperBoundMutator.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowUpperBoundMutator.java index 152e862c7d3..a5651c6bf12 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowUpperBoundMutator.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowUpperBoundMutator.java @@ -18,7 +18,7 @@ package org.matsim.contrib.freightreceiver.replanning; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.contrib.freightreceiver.ReceiverPlan; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.replanning.ReplanningContext; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardScenario.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardScenario.java index 7372c425efb..2f148bc8f08 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardScenario.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardScenario.java @@ -27,8 +27,8 @@ import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.network.NetworkWriter; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freightreceiver.*; import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils; import org.matsim.core.config.Config; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java index 614cc9741eb..922e1a8fe67 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java @@ -23,8 +23,8 @@ 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.carrier.Carriers; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.usecases.analysis.CarrierScoreStats; import org.matsim.contrib.freightreceiver.ReceiverModule; import org.matsim.contrib.freightreceiver.ReceiverReplanningType; diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java index 5587db44c74..a573811a12a 100644 --- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java +++ b/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java @@ -23,8 +23,8 @@ 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.carrier.Carriers; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.usecases.analysis.CarrierScoreStats; import org.matsim.contrib.freightreceiver.ReceiverModule; import org.matsim.contrib.freightreceiver.ReceiverReplanningType; diff --git a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversReaderTest.java b/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversReaderTest.java index 270e8053c4d..4907eb141a6 100644 --- a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversReaderTest.java +++ b/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversReaderTest.java @@ -24,8 +24,8 @@ import org.junit.Rule; import org.junit.Test; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils; import org.matsim.core.utils.misc.Time; import org.matsim.testcases.MatsimTestUtils; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierLoadAnalysis.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierLoadAnalysis.java index 2c9299c8034..f26e1bf87f1 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierLoadAnalysis.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierLoadAnalysis.java @@ -5,7 +5,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.events.Event; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.events.CarrierEventAttributes; import org.matsim.contrib.freight.carriers.events.CarrierShipmentDeliveryStartEvent; import org.matsim.contrib.freight.carriers.events.CarrierShipmentPickupStartEvent; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierPlanAnalysis.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierPlanAnalysis.java index f6e026b83b7..7c7c7e944bb 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierPlanAnalysis.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierPlanAnalysis.java @@ -3,8 +3,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; -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 java.io.BufferedWriter; import java.io.FileWriter; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventHandler.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventHandler.java index e083c827beb..c9763a98685 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventHandler.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventHandler.java @@ -28,10 +28,10 @@ import org.matsim.api.core.v01.events.handler.*; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent; import org.matsim.contrib.freight.carriers.events.CarrierShipmentDeliveryEndEvent; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisServiceTracking.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisServiceTracking.java index 032a30cb546..a8968052e17 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisServiceTracking.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisServiceTracking.java @@ -24,7 +24,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisShipmentTracking.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisShipmentTracking.java index 827f6d1cf10..b72c730b88f 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisShipmentTracking.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisShipmentTracking.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierShipment; import org.matsim.contrib.freight.carriers.events.CarrierShipmentDeliveryEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierShipmentPickupEndEvent; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisVehicleTracking.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisVehicleTracking.java index b38dd8cdcf2..8b6dd81a99f 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisVehicleTracking.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisVehicleTracking.java @@ -28,7 +28,7 @@ import org.matsim.api.core.v01.events.LinkLeaveEvent; import org.matsim.api.core.v01.events.PersonLeavesVehicleEvent; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.VehicleType; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java index fd6975f32aa..916d6ac58b2 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java @@ -6,9 +6,9 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.events.LinkEnterEvent; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.Tour; import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; import org.matsim.core.events.handler.BasicEventHandler; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysis.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysis.java index 680c02a7c4f..73857df7ae5 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysis.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysis.java @@ -22,9 +22,9 @@ package org.matsim.contrib.freight.carriers.analysis; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlanXmlReader; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.CarrierPlanXmlReader; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.core.api.experimental.events.EventsManager; import org.matsim.core.events.EventsUtils; import org.matsim.core.events.MatsimEventsReader; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisEventBased.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisEventBased.java index 3a929c810cc..24ad8b3e3f4 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisEventBased.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisEventBased.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Scenario; import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; +import org.matsim.contrib.freight.carriers.CarrierUtils; import org.matsim.core.api.experimental.events.EventsManager; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyFreightVehicleTrackerEventHandler.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyFreightVehicleTrackerEventHandler.java index 016794b1d67..82b2624d3b2 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyFreightVehicleTrackerEventHandler.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyFreightVehicleTrackerEventHandler.java @@ -24,8 +24,7 @@ import org.matsim.api.core.v01.events.*; import org.matsim.api.core.v01.events.handler.*; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.analysis.FreightAnalysisVehicleTracking; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.Vehicles; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyServiceTrackerEventHandler.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyServiceTrackerEventHandler.java index 56eddcb1c28..f0ec8e97b70 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyServiceTrackerEventHandler.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyServiceTrackerEventHandler.java @@ -3,10 +3,9 @@ import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.handler.ActivityStartEventHandler; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.analysis.FreightAnalysisServiceTracking; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyShipmentTrackerEventHandler.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyShipmentTrackerEventHandler.java index 06156b10c8a..973d26b2c01 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyShipmentTrackerEventHandler.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyShipmentTrackerEventHandler.java @@ -3,10 +3,9 @@ import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.handler.ActivityStartEventHandler; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.analysis.FreightAnalysisShipmentTracking; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.events.CarrierShipmentDeliveryEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierShipmentPickupEndEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightShipmentDeliveryEventHandler; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisIT.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisIT.java index 597cd778391..912025ae734 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisIT.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisIT.java @@ -28,7 +28,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.population.Person; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.core.api.experimental.events.EventsManager; import org.matsim.core.events.EventsUtils; import org.matsim.core.events.MatsimEventsReader; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest.java index f69b55e8fce..67c3bfbb0fe 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest.java @@ -6,10 +6,10 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlanXmlReader; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.CarrierPlanXmlReader; +import org.matsim.contrib.freight.carriers.CarrierShipment; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.core.api.experimental.events.EventsManager; import org.matsim.core.events.EventsUtils; import org.matsim.core.events.MatsimEventsReader;