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

json stuff

Browse source
This commit is contained in:
oblonski 2014-12-10 11:32:23 +01:00
parent 714bc9d4af
commit 370a5af55d
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonReader.java
View file

@ -33,6 +33,7 @@ import jsprit.core.problem.vehicle.VehicleTypeImpl;
import jsprit.core.util.Coordinate; import jsprit.core.util.Coordinate;
import java.io.File; import java.io.File;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -68,7 +69,7 @@ public class VrpJsonReader {
parse(root); parse(root);
} }
private void parse(JsonNode problemRoot) { public void parse(JsonNode problemRoot) {
setFleetSize(problemRoot); setFleetSize(problemRoot);
parse_and_map_vehicle_types(problemRoot); parse_and_map_vehicle_types(problemRoot);
parse_vehicles(problemRoot); parse_vehicles(problemRoot);
@ -91,7 +92,7 @@ public class VrpJsonReader {
JsonNode node = null; JsonNode node = null;
try { try {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
node = objectMapper.readTree(jsonFile).path(JsonConstants.PROBLEM); node = objectMapper.readTree(new FileReader(jsonFile)).path(JsonConstants.PROBLEM);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
System.exit(1); System.exit(1);

2
jsprit-core/src/main/java/jsprit/core/problem/io/VrpJsonWriter.java
View file

@ -72,6 +72,8 @@ public class VrpJsonWriter {
JsonGenerator jsonGenerator = new JsonFactory().createGenerator(stringWriter); JsonGenerator jsonGenerator = new JsonFactory().createGenerator(stringWriter);
if(solution == null) writeProblem(jsonGenerator); if(solution == null) writeProblem(jsonGenerator);
else writeSolution(jsonGenerator); else writeSolution(jsonGenerator);
jsonGenerator.flush();
jsonGenerator.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
System.exit(1); System.exit(1);