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

issue #58 - fix bug

Browse source
This commit is contained in:
Stefan Schroeder 2013-12-05 18:16:18 +01:00
parent 4c2651087b
commit ad93dfeb47
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java
View file

@ -441,10 +441,15 @@ public class VrpXMLReader{
String penalty = typeConfig.getString("[@type]"); String penalty = typeConfig.getString("[@type]");
if(penalty != null){ if(penalty != null){
if(penalty.equals("penalty")){ if(penalty.equals("penalty")){
type = new PenaltyVehicleType(type); String penaltyFactor = typeConfig.getString("[@penaltyFactor]");
if(penaltyFactor != null){
type = new PenaltyVehicleType(type,Double.parseDouble(penaltyFactor));
}
else type = new PenaltyVehicleType(type);
id = id + "_penalty"; id = id + "_penalty";
} }
} }
types.put(id, type); types.put(id, type);
} }

1
jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLWriter.java
View file

@ -248,6 +248,7 @@ public class VrpXMLWriter {
for(VehicleType type : vrp.getTypes()){ for(VehicleType type : vrp.getTypes()){
if(type instanceof PenaltyVehicleType){ if(type instanceof PenaltyVehicleType){
xmlConfig.setProperty(typePathString + "("+typeCounter+")[@type]", "penalty"); xmlConfig.setProperty(typePathString + "("+typeCounter+")[@type]", "penalty");
xmlConfig.setProperty(typePathString + "("+typeCounter+")[@penaltyFactor]", ((PenaltyVehicleType)type).getPenaltyFactor());
} }
xmlConfig.setProperty(typePathString + "("+typeCounter+").id", type.getTypeId()); xmlConfig.setProperty(typePathString + "("+typeCounter+").id", type.getTypeId());
xmlConfig.setProperty(typePathString + "("+typeCounter+").capacity", type.getCapacity()); xmlConfig.setProperty(typePathString + "("+typeCounter+").capacity", type.getCapacity());

1
jsprit-core/src/main/resources/vrp_xml_schema.xsd
View file

@ -82,6 +82,7 @@
</xs:element> </xs:element>
</xs:all> </xs:all>
<xs:attribute name="type" type="xs:string" use="optional" /> <xs:attribute name="type" type="xs:string" use="optional" />
<xs:attribute name="penaltyFactor" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>