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

modify instance getters to not add fixed costs automatically

Browse source
This commit is contained in:
oblonski 2015-03-05 16:25:49 +01:00
parent 63edfaa7ef
commit 5648630b0a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
jsprit-instances/src/main/java/jsprit/instance/util/Instances.java
View file

@ -132,7 +132,7 @@ public class Instances {
for(int i=0;i<9;i++){ for(int i=0;i<9;i++){
VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
String file = inputFolder + "/C1"+ getInstanceNu(i+1) + ".txt"; String file = inputFolder + "/C1"+ getInstanceNu(i+1) + ".txt";
new SolomonReader(builder,1000).read(file); new SolomonReader(builder).read(file);
VehicleRoutingProblem p = builder.build(); VehicleRoutingProblem p = builder.build();
instances.add(new BenchmarkInstance("C1" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue())); instances.add(new BenchmarkInstance("C1" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue()));
} }
@ -153,7 +153,7 @@ public class Instances {
for(int i=0;i<8;i++){ for(int i=0;i<8;i++){
VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
String file = inputFolder + "/C2"+ getInstanceNu(i+1) + ".txt"; String file = inputFolder + "/C2"+ getInstanceNu(i+1) + ".txt";
new SolomonReader(builder,1000).read(file); new SolomonReader(builder).read(file);
VehicleRoutingProblem p = builder.build(); VehicleRoutingProblem p = builder.build();
instances.add(new BenchmarkInstance("C2" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue())); instances.add(new BenchmarkInstance("C2" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue()));
} }
@ -174,7 +174,7 @@ public class Instances {
for(int i=0;i<12;i++){ for(int i=0;i<12;i++){
VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
String file = inputFolder + "/R1"+ getInstanceNu(i+1) + ".txt"; String file = inputFolder + "/R1"+ getInstanceNu(i+1) + ".txt";
new SolomonReader(builder,1000).read(file); new SolomonReader(builder).read(file);
VehicleRoutingProblem p = builder.build(); VehicleRoutingProblem p = builder.build();
instances.add(new BenchmarkInstance("R1" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue())); instances.add(new BenchmarkInstance("R1" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue()));
} }
@ -196,7 +196,7 @@ public class Instances {
for(int i=0;i<11;i++){ for(int i=0;i<11;i++){
VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
String file = inputFolder + "/R2"+ getInstanceNu(i+1) + ".txt"; String file = inputFolder + "/R2"+ getInstanceNu(i+1) + ".txt";
new SolomonReader(builder,1000).read(file); new SolomonReader(builder).read(file);
VehicleRoutingProblem p = builder.build(); VehicleRoutingProblem p = builder.build();
instances.add(new BenchmarkInstance("R2" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue())); instances.add(new BenchmarkInstance("R2" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue()));
} }
@ -217,7 +217,7 @@ public class Instances {
for(int i=0;i<8;i++){ for(int i=0;i<8;i++){
VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
String file = inputFolder + "/RC1"+ getInstanceNu(i+1) + ".txt"; String file = inputFolder + "/RC1"+ getInstanceNu(i+1) + ".txt";
new SolomonReader(builder,1000).read(file); new SolomonReader(builder).read(file);
VehicleRoutingProblem p = builder.build(); VehicleRoutingProblem p = builder.build();
instances.add(new BenchmarkInstance("RC1" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue())); instances.add(new BenchmarkInstance("RC1" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue()));
} }
@ -239,7 +239,7 @@ public class Instances {
for(int i=0;i<8;i++){ for(int i=0;i<8;i++){
VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
String file = inputFolder + "/RC2"+ getInstanceNu(i+1) + ".txt"; String file = inputFolder + "/RC2"+ getInstanceNu(i+1) + ".txt";
new SolomonReader(builder,1000).read(file); new SolomonReader(builder).read(file);
VehicleRoutingProblem p = builder.build(); VehicleRoutingProblem p = builder.build();
instances.add(new BenchmarkInstance("RC2" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue())); instances.add(new BenchmarkInstance("RC2" + getInstanceNu(i+1), p, bestKnown.get(i).doubleValue(), bestKnowVehicles.get(i).doubleValue()));
} }