Skip to content
This repository has been archived by the owner on Nov 29, 2024. It is now read-only.

Commit

Permalink
move stuff from package "carrier" on level up.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kt86
kt86 committed Oct 11, 2023
1 parent e79e9f3 commit 9216a73
Show file tree
Hide file tree
Showing 107 changed files with 212 additions and 245 deletions.
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +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.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;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,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.controler.CarrierControlerUtils;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
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.*;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
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.*;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/example/lsp/initialPlans/MyCarrierScorer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package example.lsp.initialPlans;

import org.matsim.contrib.freight.carriers.carrier.Carrier;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.core.scoring.ScoringFunction;
import org.matsim.core.scoring.SumScoringFunction;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import org.matsim.api.core.v01.events.Event;
import org.matsim.api.core.v01.events.LinkEnterEvent;
import org.matsim.api.core.v01.network.Network;
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.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent;
import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,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.config.groups.VspExperimentalConfigGroup;
import org.matsim.core.controler.AbstractModule;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,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.events.CarrierServiceEndEvent;
import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
import org.matsim.core.config.Config;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,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.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.groups.VspExperimentalConfigGroup;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +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.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.config.groups.VspExperimentalConfigGroup;
import org.matsim.core.controler.AbstractModule;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import org.matsim.api.core.v01.events.Event;
import org.matsim.api.core.v01.events.LinkEnterEvent;
import org.matsim.api.core.v01.network.Network;
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.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent;
import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,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.FreightConfigGroup;
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.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
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.*;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
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.*;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
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.*;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
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.*;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import lsp.shipment.LSPShipment;
import lsp.shipment.ShipmentUtils;
import org.matsim.api.core.v01.Id;
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 java.util.ArrayList;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.contrib.freight.carriers.carrier.CarrierService;
import org.matsim.contrib.freight.carriers.CarrierService;
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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,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.config.groups.VspExperimentalConfigGroup;
import org.matsim.core.controler.Controler;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/example/lsp/simulationTrackers/TourStartHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.*;
import org.matsim.contrib.freight.carriers.*;
import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent;
import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler;

Expand Down
4 changes: 2 additions & 2 deletions ...in/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/lsp/LSPCarrierResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package lsp;

import org.matsim.contrib.freight.carriers.carrier.Carrier;
import org.matsim.contrib.freight.carriers.Carrier;

public interface LSPCarrierResource extends LSPResource {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/lsp/LSPControlerListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
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.Carrier;
import org.matsim.contrib.freight.carriers.carrier.CarrierPlanWriter;
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.CarrierPlanWriter;
import org.matsim.contrib.freight.carriers.CarrierUtils;
import org.matsim.contrib.freight.carriers.Carriers;
import org.matsim.contrib.freight.carriers.controler.CarrierAgentTracker;
import org.matsim.core.api.experimental.events.EventsManager;
import org.matsim.core.controler.MatsimServices;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lsp/LSPModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import org.matsim.api.core.v01.population.HasPlansAndId;
import org.matsim.api.core.v01.population.Leg;
import org.matsim.contrib.freight.carriers.FreightConfigGroup;
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.controler.*;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.controler.AbstractModule;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/lsp/LSPScorer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package lsp;

import org.matsim.api.core.v01.population.Activity;
import org.matsim.contrib.freight.carriers.carrier.Carrier;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.core.controler.listener.ControlerListener;
import org.matsim.core.events.handler.EventHandler;
import org.matsim.core.scoring.ScoringFunction;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lsp/LSPUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import lsp.shipment.ShipmentPlan;
import org.matsim.api.core.v01.Id;
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.utils.objectattributes.attributable.Attributable;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/lsp/io/LSPPlanXmlParserV1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
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.*;
import org.matsim.contrib.freight.carriers.*;
import org.matsim.core.gbl.Gbl;
import org.matsim.core.utils.io.MatsimXmlParser;
import org.matsim.core.utils.misc.Time;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/lsp/io/LSPPlanXmlReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import lsp.LSPs;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.matsim.contrib.freight.carriers.carrier.Carriers;
import org.matsim.contrib.freight.carriers.Carriers;
import org.matsim.core.api.internal.MatsimReader;
import org.matsim.core.utils.io.MatsimXmlParser;
import org.xml.sax.Attributes;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution;
import com.graphhopper.jsprit.core.util.Solutions;
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;
import org.matsim.contrib.freight.carriers.CarrierPlan;
import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import lsp.shipment.ShipmentUtils;
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.CarrierVehicle;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.CarrierVehicle;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.vehicles.VehicleType;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,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.Carrier;
import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.CarrierVehicle;

import java.util.Collection;
import java.util.List;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
import lsp.shipment.ShipmentPlanElement;
import lsp.shipment.ShipmentUtils;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.freight.carriers.carrier.Carrier;
import org.matsim.contrib.freight.carriers.carrier.CarrierService;
import org.matsim.contrib.freight.carriers.carrier.ScheduledTour;
import org.matsim.contrib.freight.carriers.carrier.Tour;
import org.matsim.contrib.freight.carriers.carrier.Tour.Leg;
import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.CarrierService;
import org.matsim.contrib.freight.carriers.ScheduledTour;
import org.matsim.contrib.freight.carriers.Tour;
import org.matsim.contrib.freight.carriers.Tour.Leg;
import org.matsim.contrib.freight.carriers.Tour.TourElement;

import java.util.ArrayList;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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.Carrier;
import org.matsim.contrib.freight.carriers.Carrier;

import java.util.ArrayList;

Expand Down
2 changes: 1 addition & 1 deletion .../java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import lsp.shipment.ShipmentPlanElement;
import lsp.shipment.ShipmentUtils;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.freight.carriers.carrier.CarrierService;
import org.matsim.contrib.freight.carriers.CarrierService;
import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent;
import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
import org.matsim.core.controler.events.AfterMobsimEvent;
Expand Down
8 changes: 4 additions & 4 deletions ...ain/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
import lsp.shipment.ShipmentPlanElement;
import lsp.shipment.ShipmentUtils;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.freight.carriers.carrier.CarrierService;
import org.matsim.contrib.freight.carriers.carrier.Tour;
import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity;
import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement;
import org.matsim.contrib.freight.carriers.CarrierService;
import org.matsim.contrib.freight.carriers.Tour;
import org.matsim.contrib.freight.carriers.Tour.ServiceActivity;
import org.matsim.contrib.freight.carriers.Tour.TourElement;
import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent;
import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourEndEventHandler;
import org.matsim.core.controler.events.AfterMobsimEvent;
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,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.Carrier;
import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.CarrierVehicle;

import java.util.Collection;

Expand Down
Loading

0 comments on commit 9216a73

Please sign in to comment.