Skip to content

Commit

Permalink
remove "contrib" from package name.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kt86
kt86 committed Oct 12, 2023
1 parent 4c1b03d commit 3e5ba54
Show file tree
Hide file tree
Showing 22 changed files with 108 additions and 108 deletions.
26 changes: 13 additions & 13 deletions src/main/java/org/matsim/vsp/DistanceConstraint/DistanceConstraintUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
import org.apache.logging.log4j.Logger;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Network;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.CarrierPlan;
import org.matsim.contrib.freight.carriers.CarrierService;
import org.matsim.contrib.freight.carriers.CarrierUtils;
import org.matsim.contrib.freight.carriers.CarrierVehicle;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypes;
import org.matsim.contrib.freight.carriers.ScheduledTour;
import org.matsim.contrib.freight.carriers.Tour;
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;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.CarrierPlan;
import org.matsim.freight.carriers.CarrierService;
import org.matsim.freight.carriers.CarrierUtils;
import org.matsim.freight.carriers.CarrierVehicle;
import org.matsim.freight.carriers.CarrierVehicleTypes;
import org.matsim.freight.carriers.ScheduledTour;
import org.matsim.freight.carriers.Tour;
import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.freight.carriers.jsprit.NetworkRouter;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
import org.matsim.core.population.routes.NetworkRoute;
import org.matsim.core.population.routes.RouteUtils;
import org.matsim.vehicles.Vehicle;
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/org/matsim/vsp/DistanceConstraint/RunDistanceConstraint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Network;
import org.matsim.api.core.v01.population.Person;
import org.matsim.contrib.freight.carriers.*;
import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.contrib.freight.carriers.controler.CarrierModule;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
import org.matsim.freight.carriers.*;
import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.freight.carriers.controler.CarrierModule;
import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.freight.carriers.jsprit.NetworkRouter;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.groups.ControlerConfigGroup.CompressionType;
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/org/matsim/vsp/freight/CarrierScoringFunctionFactoryImpl_KT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
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.CarrierPlan;
import org.matsim.contrib.freight.carriers.CarrierVehicle;
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.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.FreightActivity;
import org.matsim.contrib.freight.carriers.jsprit.VehicleTypeDependentRoadPricingCalculator;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.CarrierPlan;
import org.matsim.freight.carriers.CarrierVehicle;
import org.matsim.freight.carriers.ScheduledTour;
import org.matsim.freight.carriers.Tour.ServiceActivity;
import org.matsim.freight.carriers.Tour.TourElement;
import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.freight.carriers.controler.FreightActivity;
import org.matsim.freight.carriers.jsprit.VehicleTypeDependentRoadPricingCalculator;
import org.matsim.core.population.routes.NetworkRoute;
import org.matsim.core.population.routes.RouteUtils;
import org.matsim.core.scoring.ScoringFunction;
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/org/matsim/vsp/freight/RunFreight.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
import org.apache.logging.log4j.Logger;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Network;
import org.matsim.contrib.freight.carriers.*;
import org.matsim.contrib.freight.carriers.Tour.ServiceActivity;
import org.matsim.contrib.freight.carriers.Tour.TourElement;
import org.matsim.contrib.freight.carriers.controler.CarrierModule;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter;
import org.matsim.freight.carriers.*;
import org.matsim.freight.carriers.Tour.ServiceActivity;
import org.matsim.freight.carriers.Tour.TourElement;
import org.matsim.freight.carriers.controler.CarrierModule;
import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.freight.carriers.jsprit.NetworkRouter;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.consistency.VspConfigConsistencyCheckerImpl;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/matsim/vsp/freight/RunFreightOnlyMatsim.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
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.*;
import org.matsim.contrib.freight.carriers.controler.CarrierModule;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.freight.carriers.*;
import org.matsim.freight.carriers.controler.CarrierModule;
import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.consistency.VspConfigConsistencyCheckerImpl;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/matsim/vsp/freight/WriteCarrierScoreInfos.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import java.util.TreeMap;

import org.matsim.api.core.v01.Id;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.Carriers;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.Carriers;

/**
* @author kt
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/org/matsim/vsp/freight/food/RunFood.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
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.FreightCarriersConfigGroup;
import org.matsim.contrib.freight.carriers.analysis.RunFreightAnalysisEventBased;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.CarrierPlan;
import org.matsim.contrib.freight.carriers.CarrierUtils;
import org.matsim.contrib.freight.carriers.Carriers;
import org.matsim.contrib.freight.carriers.controler.CarrierModule;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter;
import org.matsim.freight.carriers.FreightCarriersConfigGroup;
import org.matsim.freight.carriers.analysis.RunFreightAnalysisEventBased;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.CarrierPlan;
import org.matsim.freight.carriers.CarrierUtils;
import org.matsim.freight.carriers.Carriers;
import org.matsim.freight.carriers.controler.CarrierModule;
import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.freight.carriers.jsprit.NetworkRouter;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.groups.PlansConfigGroup;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/vsp/freight/food/analyse/FreightAnalyseKT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
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.*;
import org.matsim.core.api.experimental.events.EventsManager;
import org.matsim.core.controler.OutputDirectoryLogging;
import org.matsim.core.events.EventsUtils;
import org.matsim.core.events.MatsimEventsReader;
import org.matsim.core.network.NetworkUtils;
import org.matsim.core.utils.io.UncheckedIOException;
import org.matsim.freight.carriers.*;

import java.io.File;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/vsp/freight/food/analyse/TripEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.matsim.api.core.v01.events.handler.PersonArrivalEventHandler;
import org.matsim.api.core.v01.network.Network;
import org.matsim.api.core.v01.population.Person;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypes;
import org.matsim.freight.carriers.CarrierVehicleTypes;
import org.matsim.vehicles.VehicleType;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/vsp/freight/food/analyse/TripWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.logging.log4j.Logger;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Person;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypes;
import org.matsim.freight.carriers.CarrierVehicleTypes;
import org.matsim.vehicles.VehicleType;

import java.io.BufferedWriter;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/vsp/freight/food/prepare/AddAdditionalBEVTrucksToCarriers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.apache.logging.log4j.Logger;

import org.matsim.api.core.v01.Id;
import org.matsim.contrib.freight.carriers.*;
import org.matsim.core.gbl.Gbl;
import org.matsim.freight.carriers.*;
import org.matsim.vehicles.Vehicle;
import org.matsim.vehicles.VehicleType;
import org.matsim.vehicles.VehicleUtils;
Expand Down
6 changes: 3 additions & 3 deletions ...ava/org/matsim/vsp/freight/food/prepare/AddDistanceConstraintInputToVehicleTypesFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

package org.matsim.vsp.freight.food.prepare;

import org.matsim.contrib.freight.carriers.CarrierVehicleTypeReader;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypeWriter;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypes;
import org.matsim.freight.carriers.CarrierVehicleTypeReader;
import org.matsim.freight.carriers.CarrierVehicleTypeWriter;
import org.matsim.freight.carriers.CarrierVehicleTypes;
import org.matsim.vehicles.*;


Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/vsp/freight/food/prepare/ConvertCarriersToOpenBerlin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
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.*;
import org.matsim.core.network.NetworkUtils;
import org.matsim.core.network.filter.NetworkFilterManager;
import org.matsim.freight.carriers.*;
import org.matsim.utils.objectattributes.attributable.Attributes;
import org.matsim.vehicles.Vehicle;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/matsim/vsp/freight/food/prepare/ConvertToShipments.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@


import org.matsim.api.core.v01.Scenario;
import org.matsim.contrib.freight.carriers.FreightCarriersConfigGroup;
import org.matsim.contrib.freight.carriers.CarrierPlanWriter;
import org.matsim.contrib.freight.carriers.CarrierUtils;
import org.matsim.contrib.freight.carriers.Carriers;
import org.matsim.freight.carriers.FreightCarriersConfigGroup;
import org.matsim.freight.carriers.CarrierPlanWriter;
import org.matsim.freight.carriers.CarrierUtils;
import org.matsim.freight.carriers.Carriers;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.scenario.ScenarioUtils;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/matsim/vsp/freightAnalysis/FreightAnalyse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
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.FreightCarriersConfigGroup;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.CarrierUtils;
import org.matsim.freight.carriers.FreightCarriersConfigGroup;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.CarrierUtils;
import org.matsim.core.api.experimental.events.EventsManager;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/vsp/freightAnalysis/TripEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.matsim.api.core.v01.events.handler.PersonArrivalEventHandler;
import org.matsim.api.core.v01.network.Network;
import org.matsim.api.core.v01.population.Person;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypes;
import org.matsim.freight.carriers.CarrierVehicleTypes;
import org.matsim.vehicles.VehicleType;
import org.matsim.vehicles.Vehicles;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/matsim/vsp/freightAnalysis/TripWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import org.apache.logging.log4j.Logger;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Person;
import org.matsim.contrib.freight.carriers.Carrier;
import org.matsim.contrib.freight.carriers.Carriers;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.Carriers;
import org.matsim.vehicles.VehicleType;
import org.matsim.vehicles.Vehicles;

Expand Down
16 changes: 8 additions & 8 deletions src/main/java/org/matsim/vsp/wasteCollection/AbfallChessboardUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
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.CarrierCapabilities;
import org.matsim.contrib.freight.carriers.CarrierVehicle;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypeLoader;
import org.matsim.contrib.freight.carriers.CarrierVehicleTypes;
import org.matsim.contrib.freight.carriers.Carriers;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.CarrierCapabilities;
import org.matsim.freight.carriers.CarrierVehicle;
import org.matsim.freight.carriers.CarrierVehicleTypeLoader;
import org.matsim.freight.carriers.CarrierVehicleTypes;
import org.matsim.freight.carriers.Carriers;
import org.matsim.vehicles.Vehicle;
import org.matsim.vehicles.VehicleType;
import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.contrib.freight.carriers.CarrierImpl;
import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.freight.carriers.CarrierImpl;

public class AbfallChessboardUtils {

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/org/matsim/vsp/wasteCollection/AbfallUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
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.*;
import org.matsim.contrib.freight.carriers.Tour.Delivery;
import org.matsim.contrib.freight.carriers.Tour.Leg;
import org.matsim.contrib.freight.carriers.Tour.Pickup;
import org.matsim.contrib.freight.carriers.Tour.TourElement;
import org.matsim.contrib.freight.carriers.controler.CarrierModule;
import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter;
import org.matsim.freight.carriers.*;
import org.matsim.freight.carriers.Tour.Delivery;
import org.matsim.freight.carriers.Tour.Leg;
import org.matsim.freight.carriers.Tour.Pickup;
import org.matsim.freight.carriers.Tour.TourElement;
import org.matsim.freight.carriers.controler.CarrierModule;
import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
import org.matsim.freight.carriers.jsprit.NetworkRouter;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.groups.ControlerConfigGroup;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/vsp/wasteCollection/RunAnalyse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
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.*;
import org.matsim.core.network.NetworkUtils;
import org.matsim.core.population.routes.NetworkRoute;
import org.matsim.core.population.routes.RouteUtils;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.freight.carriers.*;

import java.io.BufferedWriter;
import java.io.File;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/matsim/vsp/wasteCollection/Run_Abfall.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
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.*;
import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.freight.carriers.*;
import org.matsim.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
18 changes: 9 additions & 9 deletions src/test/java/org/matsim/vsp/DistanceConstraint/TestRunDistanceConstraint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Network;
import org.matsim.contrib.freight.carriers.*;
import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.contrib.freight.carriers.controler.CarrierModule;
import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter;
import org.matsim.freight.carriers.*;
import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
import org.matsim.freight.carriers.controler.CarrierModule;
import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
import org.matsim.freight.carriers.controler.CarrierStrategyManager;
import org.matsim.freight.carriers.controler.CarrierControlerUtils;
import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.freight.carriers.jsprit.NetworkRouter;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.groups.ControlerConfigGroup.CompressionType;
Expand Down

0 comments on commit 3e5ba54

Please sign in to comment.