trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

improve vehicle fleet manager

Browse source
This commit is contained in:
oblonski 2015-10-09 14:57:29 +02:00
parent 6be32f6305
commit 6901504854
2 changed files with 61 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java
View file

@ -77,7 +77,6 @@ class VehicleFleetManagerImpl implements VehicleFleetManager {
int arrSize = vehicles.size() + 2; int arrSize = vehicles.size() + 2;
locked = new boolean[arrSize]; locked = new boolean[arrSize];
vehicleArr = new Vehicle[arrSize]; vehicleArr = new Vehicle[arrSize];
vehicleTypes = new TypeContainer[arrSize];
initializeVehicleTypes(); initializeVehicleTypes();
logger.debug("initialise {}",this); logger.debug("initialise {}",this);
} }
@ -88,6 +87,13 @@ class VehicleFleetManagerImpl implements VehicleFleetManager {
} }
private void initializeVehicleTypes() { private void initializeVehicleTypes() {
int maxTypeIndex = 0;
for(Vehicle v : vehicles){
if(v.getVehicleTypeIdentifier().getIndex() > maxTypeIndex){
maxTypeIndex = v.getVehicleTypeIdentifier().getIndex();
}
}
vehicleTypes = new TypeContainer[maxTypeIndex+1];
for(int i=0;i< vehicleTypes.length;i++){ for(int i=0;i< vehicleTypes.length;i++){
vehicleTypes[i] = new TypeContainer(); vehicleTypes[i] = new TypeContainer();
} }

81
jsprit-core/src/test/resources/infiniteWriterV2Test.xml
View file

@ -2,24 +2,9 @@
<problem xmlns="http://www.w3schools.com" <problem xmlns="http://www.w3schools.com"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3schools.com vrp_xml_schema.xsd"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3schools.com vrp_xml_schema.xsd">
<problemType> <problemType>
<fleetSize>FINITE</fleetSize> <fleetSize>INFINITE</fleetSize>
</problemType> </problemType>
<vehicles> <vehicles>
<vehicle>
<id>v2</id>
<typeId>vehType2</typeId>
<startLocation>
<id>loc</id>
</startLocation>
<endLocation>
<id>loc</id>
</endLocation>
<timeSchedule>
<start>0.0</start>
<end>1.7976931348623157E308</end>
</timeSchedule>
<returnToDepot>true</returnToDepot>
</vehicle>
<vehicle> <vehicle>
<id>v1</id> <id>v1</id>
<typeId>vehType</typeId> <typeId>vehType</typeId>
@ -48,16 +33,58 @@
<time>0.0</time> <time>0.0</time>
</costs> </costs>
</type> </type>
<type>
<id>vehType2</id>
<capacity-dimensions>
<dimension index="0">200</dimension>
</capacity-dimensions>
<costs>
<fixed>0.0</fixed>
<distance>1.0</distance>
<time>0.0</time>
</costs>
</type>
</vehicleTypes> </vehicleTypes>
<services>
<service id="1" type="service">
<location>
<id>loc</id>
</location>
<capacity-dimensions>
<dimension index="0">1</dimension>
</capacity-dimensions>
<duration>2.0</duration>
<timeWindows>
<timeWindow>
<start>0.0</start>
<end>1.7976931348623157E308</end>
</timeWindow>
</timeWindows>
</service>
<service id="2" type="service">
<location>
<id>loc2</id>
</location>
<capacity-dimensions>
<dimension index="0">1</dimension>
</capacity-dimensions>
<duration>4.0</duration>
<timeWindows>
<timeWindow>
<start>0.0</start>
<end>1.7976931348623157E308</end>
</timeWindow>
</timeWindows>
</service>
</services>
<solutions>
<solution>
<cost>10.0</cost>
<routes>
<route>
<driverId>noDriver</driverId>
<vehicleId>v1</vehicleId>
<start>0.0</start>
<act type="service">
<serviceId>1</serviceId>
<arrTime>0.0</arrTime>
<endTime>0.0</endTime>
</act>
<end>0.0</end>
</route>
</routes>
<unassignedJobs>
<job id="2"/>
</unassignedJobs>
</solution>
</solutions>
</problem> </problem>