From 305b5e5cab98935951673a67314ba9f55cb5eb84 Mon Sep 17 00:00:00 2001
From: oblonski <4sschroeder@gmail.com>
Date: Wed, 27 Aug 2014 12:50:46 +0200
Subject: [PATCH] remove penalty-veh constructor in
 jsprit-instances.reader.CordeauReader

---
 .../jsprit/instance/reader/CordeauReader.java | 15 +++++----
 .../java/jsprit/instance/util/Instances.java  | 32 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java b/jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java
index a34643a9..ba2e95ef 100644
--- a/jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java
+++ b/jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java
@@ -1,16 +1,16 @@
 /*******************************************************************************
- * Copyright (C) 2013  Stefan Schroeder
- * 
+ * Copyright (C) 2014  Stefan Schroeder
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either 
+ * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public 
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
@@ -62,7 +62,8 @@ public class CordeauReader {
 		super();
 		this.vrpBuilder = vrpBuilder;
 	}
-	
+
+    @Deprecated
 	public CordeauReader(VehicleRoutingProblem.Builder vrpBuilder, boolean penaltyVehicles) {
 		super();
 		this.vrpBuilder = vrpBuilder;
@@ -78,7 +79,7 @@ public class CordeauReader {
 		int nOfVehiclesAtEachDepot = 0;
 	
 		int counter = 0;
-		String line = null; 
+		String line;
 		List<List<Builder>> vehiclesAtDepot = new ArrayList<List<Builder>>();
 		int depotCounter = 0;
 		while((line = readLine(reader)) != null){
diff --git a/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java b/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java
index 8efe9b4f..d3acc4e4 100644
--- a/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java
+++ b/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java
@@ -1,37 +1,33 @@
 /*******************************************************************************
- * Copyright (C) 2013  Stefan Schroeder
- * 
+ * Copyright (C) 2014  Stefan Schroeder
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either 
+ * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public 
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 package jsprit.instance.util;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
 import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.util.BenchmarkInstance;
 import jsprit.instance.reader.ChristofidesReader;
 import jsprit.instance.reader.CordeauReader;
 import jsprit.instance.reader.SolomonReader;
 
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 
 public class Instances {
 
@@ -48,12 +44,14 @@ public class Instances {
 		for(int i=0;i<12;i++){
 			VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
 			String file = inputFolder + "/p"+  getInstanceNu(i+1);
-			new CordeauReader(builder,true).read(file);
+			new CordeauReader(builder).read(file);
 			VehicleRoutingProblem p = builder.build();
 			instances.add(new BenchmarkInstance("p" + getInstanceNu(i+1), p, getBestKnown(file), null));
 		}
 		return instances;
 	}
+
+
 	
 	private static double getBestKnown(String file) {
 		try {
@@ -91,7 +89,7 @@ public class Instances {
 		for(int i=0;i<10;i++){
 			VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance();
 			String file = inputFolder + "/pr"+  getInstanceNu(i+1);
-			new CordeauReader(builder,true).read(file);
+			new CordeauReader(builder).read(file);
 			VehicleRoutingProblem p = builder.build();
 			instances.add(new BenchmarkInstance("pr" + getInstanceNu(i+1), p, getBestKnown(file),null));
 		}