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

fix bug: tsp reader could not read asymmetric matrix

Browse source
This commit is contained in:
oblonski 2015-03-27 14:41:40 +01:00
parent 053840e333
commit 9184e4f392
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java
View file

@ -30,7 +30,9 @@ import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
public class TSPLIB95Reader { public class TSPLIB95Reader {
@ -57,7 +59,8 @@ public class TSPLIB95Reader {
boolean isEdgeWeightSection = false; boolean isEdgeWeightSection = false;
List<Double> edgeWeights = new ArrayList<Double>(); List<Double> edgeWeights = new ArrayList<Double>();
int dimensions = 0; int dimensions = 0;
int coordIndex = 0;
Map<Integer,Integer> indexMap = new HashMap<Integer, Integer>();
while( ( line = getLine(reader) ) != null ){ while( ( line = getLine(reader) ) != null ){
if(line.startsWith("EOF") || line.contains("EOF")){ if(line.startsWith("EOF") || line.contains("EOF")){
break; break;
@ -123,13 +126,18 @@ public class TSPLIB95Reader {
if(isCoordSection){ if(isCoordSection){
if(coords == null) throw new IllegalStateException("DIMENSION tag missing"); if(coords == null) throw new IllegalStateException("DIMENSION tag missing");
String[] tokens = line.trim().split("\\s+"); String[] tokens = line.trim().split("\\s+");
coords[Integer.parseInt(tokens[0]) - 1] = Coordinate.newInstance(Double.parseDouble(tokens[1]), Double.parseDouble(tokens[2])); Integer id = Integer.parseInt(tokens[0]);
coords[coordIndex] = Coordinate.newInstance(Double.parseDouble(tokens[1]), Double.parseDouble(tokens[2]));
indexMap.put(id,coordIndex);
coordIndex++;
continue; continue;
} }
if(isDemandSection){ if(isDemandSection){
if(demands == null) throw new IllegalStateException("DIMENSION tag missing"); if(demands == null) throw new IllegalStateException("DIMENSION tag missing");
String[] tokens = line.trim().split("\\s+"); String[] tokens = line.trim().split("\\s+");
demands[Integer.parseInt(tokens[0]) - 1] = Integer.parseInt(tokens[1]); Integer id = Integer.parseInt(tokens[0]);
int index = indexMap.get(id);
demands[index] = Integer.parseInt(tokens[1]);
continue; continue;
} }
if(isDepotSection){ if(isDepotSection){
@ -156,14 +164,14 @@ public class TSPLIB95Reader {
vrpBuilder.addVehicle(vehicle); vrpBuilder.addVehicle(vehicle);
} }
for (int i = 0; i < coords.length; i++) { for (Integer id_ : indexMap.keySet()) {
String id = "" + (i + 1); String id = id_.toString();
int index = indexMap.get(id_);
if(depotIds.isEmpty()){ if(depotIds.isEmpty()){
if(i==0) { if(index == 0) {
VehicleImpl vehicle = VehicleImpl.Builder.newInstance("traveling_salesman") VehicleImpl vehicle = VehicleImpl.Builder.newInstance("traveling_salesman")
.setStartLocation(Location.Builder.newInstance().setId(id) .setStartLocation(Location.Builder.newInstance().setId(id)
.setCoordinate(coords[i]).setIndex(i).build()) .setCoordinate(coords[index]).setIndex(index).build())
.build(); .build();
vrpBuilder.addVehicle(vehicle); vrpBuilder.addVehicle(vehicle);
continue; continue;
@ -171,8 +179,8 @@ public class TSPLIB95Reader {
} }
Service service = Service.Builder.newInstance(id) Service service = Service.Builder.newInstance(id)
.setLocation(Location.Builder.newInstance().setId(id) .setLocation(Location.Builder.newInstance().setId(id)
.setCoordinate(coords[i]).setIndex(i).build()) .setCoordinate(coords[index]).setIndex(index).build())
.addSizeDimension(0, demands[i]).build(); .addSizeDimension(0, demands[index]).build();
vrpBuilder.addJob(service); vrpBuilder.addJob(service);
} }
if(edgeType.equals("GEO")){ if(edgeType.equals("GEO")){
@ -228,7 +236,7 @@ public class TSPLIB95Reader {
vrpBuilder.setRoutingCost(matrixBuilder.build()); vrpBuilder.setRoutingCost(matrixBuilder.build());
} }
else if(edgeWeightFormat.equals("FULL_MATRIX")){ else if(edgeWeightFormat.equals("FULL_MATRIX")){
FastVehicleRoutingTransportCostsMatrix.Builder matrixBuilder = FastVehicleRoutingTransportCostsMatrix.Builder.newInstance(dimensions,true); FastVehicleRoutingTransportCostsMatrix.Builder matrixBuilder = FastVehicleRoutingTransportCostsMatrix.Builder.newInstance(dimensions,false);
int fromIndex = 0; int fromIndex = 0;
int toIndex = 0; int toIndex = 0;
for(int i=0;i<edgeWeights.size();i++){ for(int i=0;i<edgeWeights.size();i++){