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

rm ToDos

Browse source
This commit is contained in:
oblonski 2015-04-24 16:07:26 +02:00
parent 7b578d3ce6
commit 4757753f26
14 changed files with 25 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java
View file

@ -22,11 +22,9 @@ import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.VehicleRoutingProblem.Builder;
import jsprit.core.problem.job.Shipment;
import jsprit.core.problem.solution.route.activity.TimeWindow;
import jsprit.core.problem.vehicle.Vehicle;
import jsprit.core.problem.vehicle.VehicleImpl;
import jsprit.core.problem.vehicle.VehicleTypeImpl;
import jsprit.core.util.Coordinate;
import jsprit.core.util.Locations;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -186,7 +184,6 @@ public class LiLimReader {
}
reader.close();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

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

@ -46,7 +46,7 @@ public class TSPLIB95Reader {
public void read(String filename){
BufferedReader reader = getBufferedReader(filename);
String line;
String line_;
Coordinate[] coords = null;
int[] demands = null;
Integer capacity = null;
@ -61,7 +61,8 @@ public class TSPLIB95Reader {
int dimensions = 0;
int coordIndex = 0;
Map<Integer,Integer> indexMap = new HashMap<Integer, Integer>();
while( ( line = getLine(reader) ) != null ){
while( ( line_ = getLine(reader) ) != null ){
String line = line_.trim();
if(line.startsWith("EOF") || line.contains("EOF")){
break;
}

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

@ -61,10 +61,8 @@ public class Instances {
reader.close();
return result;
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return 0;
@ -79,7 +77,7 @@ public class Instances {
* Returns a collection of {@link BenchmarkInstance} which are Cordeau's pr instances.
* <p>Note that this assumes that within the folder 'inputFolder' 10 p-instances are located with their original name, i.e. pr01,pr02,...,pr10.
* <p>It also assumes that solution files are also located in inputFolder ending with .res
* @param inputFolder TODO
* @param inputFolder
* @param inputFolder where cordeau's pr instances are located. It must end without '/' such as instances/cordeau.
*
* @return a collection of {@link BenchmarkInstance}
@ -185,7 +183,7 @@ public class Instances {
* Returns a collection of {@link BenchmarkInstance} which are Solomon instances.
* <p>Note that this assumes that within the folder 'inputFolder' 11 R1-instances are located with their original name, i.e. R201.txt,R202.txt,...,R111.txt.
* <p>Note that unlike the original problems, a fixed-cost value of 1000 is set for each employed vehicle.
* @param inputFolder TODO
* @param inputFolder
* @param inputFolder where solomon R2 instances are located. It must end without '/' such as instances/solomon.
* @return a collection of {@link BenchmarkInstance}
*/
@ -228,7 +226,7 @@ public class Instances {
* Returns a collection of {@link BenchmarkInstance} which are Solomon instances.
* <p>Note that this assumes that within the folder 'inputFolder' 8 RC2-instances are located with their original name, i.e. RC201.txt,RC202.txt,...,RC208.txt.
* <p>Note that unlike the original problems, a fixed-cost value of 1000 is set for each employed vehicle.
* @param inputFolder TODO
* @param inputFolder
* @param inputFolder where solomon RC2 instances are located. It must end without '/' such as instances/solomon.
* @return a collection of {@link BenchmarkInstance}
*/