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

Merge branch 'master' into routes-with-specified-start-and-end

Browse source 
Conflicts:
	jsprit-core/src/main/resources/vrp_xml_schema.xsd
	jsprit-core/src/test/java/jsprit/core/problem/io/VrpReaderV2Test.java
This commit is contained in:
Stefan Schroeder 2014-01-23 12:22:13 +01:00
commit 0b038c6cfc
4 changed files with 228 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

38
jsprit-core/src/test/resources/finiteVrpForReaderV2Test.xml
View file

@ -112,7 +112,7 @@
<locationId>j(1,5)</locationId>
<coord x="10.0" y="10.0"/>
<capacity-demand>1</capacity-demand>
<duration>0.0</duration>
<duration>10.0</duration>
<timeWindows>
<timeWindow>
<start>0.0</start>
@ -141,10 +141,10 @@
<pickup>
<locationId>i(3,9)</locationId>
<coord x="10.0" y="10.0"/>
<duration>0.0</duration>
<duration>10.0</duration>
<timeWindows>
<timeWindow>
<start>0.0</start>
<start>1000.0</start>
<end>4000.0</end>
</timeWindow>
</timeWindows>
@ -152,16 +152,40 @@
<delivery>
<locationId>i(9,9)</locationId>
<coord x="10.0" y="0.0"/>
<duration>0.0</duration>
<duration>100.0</duration>
<timeWindows>
<timeWindow>
<start>0.0</start>
<end>4000.0</end>
<start>6000.0</start>
<end>10000.0</end>
</timeWindow>
</timeWindows>
</delivery>
<capacity-demand>1</capacity-demand>
<capacity-demand>10</capacity-demand>
</shipment>
<shipment id="4">
<pickup>
<coord x="10.0" y="10.0"/>
<timeWindows>
<timeWindow>
<start>1000.0</start>
<end>4000.0</end>
</timeWindow>
</timeWindows>
</pickup>
<delivery>
<coord x="10.0" y="0.0"/>
<duration>100.0</duration>
<timeWindows>
<timeWindow>
<start>6000.0</start>
<end>10000.0</end>
</timeWindow>
</timeWindows>
</delivery>
<capacity-demand>10</capacity-demand>
</shipment>
</shipments>
</problem>