From 82899edc97379479469c06ac0d32ed724421f7dc Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Fri, 7 Nov 2014 12:20:54 +0100 Subject: [PATCH] some json stuff --- .../main/java/jsprit/core/problem/io/VrpJsonReader.java | 9 ++++++++- .../main/java/jsprit/core/problem/io/VrpJsonWriter.java | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonReader.java b/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonReader.java index 04883f0a..de7f0f42 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonReader.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonReader.java @@ -32,7 +32,9 @@ import jsprit.core.problem.vehicle.VehicleType; import jsprit.core.problem.vehicle.VehicleTypeImpl; import jsprit.core.util.Coordinate; +import java.io.BufferedReader; import java.io.File; +import java.io.FileReader; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; @@ -91,7 +93,12 @@ public class VrpJsonReader { JsonNode node = null; try { ObjectMapper objectMapper = new ObjectMapper(); - node = objectMapper.readTree(jsonFile); + String jsonContent = ""; + BufferedReader reader = new BufferedReader(new FileReader(jsonFile)); + String line; + while((line = reader.readLine()) != null) jsonContent += line; + reader.close(); + node = objectMapper.readTree(jsonContent); } catch (IOException e) { e.printStackTrace(); System.exit(1); diff --git a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonWriter.java b/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonWriter.java index 51ce499f..de9768e9 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonWriter.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonWriter.java @@ -310,7 +310,11 @@ public class VrpJsonWriter { new VrpJsonWriter(vrp).write(new File("output/vrp.json")); // System.out.println(new VrpJsonWriter(vrp).toString()); - VehicleRoutingAlgorithm vra = new GreedySchrimpfFactory().createAlgorithm(vrp); + VehicleRoutingProblem.Builder vrpBuilder_ = VehicleRoutingProblem.Builder.newInstance(); + new VrpJsonReader(vrpBuilder_).read("output/vpr.json"); + VehicleRoutingProblem vrp_ = vrpBuilder_.build(); + + VehicleRoutingAlgorithm vra = new GreedySchrimpfFactory().createAlgorithm(vrp_); VehicleRoutingProblemSolution solutions = Solutions.bestOf(vra.searchSolutions()); new VrpJsonWriter(vrp,solutions,new SolutionAnalyser.DistanceCalculator() {