1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00

Merge branch 'routes-with-specified-start-and-end' into

access-egress-costs-merged-with-routes-with-spec-start-end

Conflicts:
	jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java
	jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExampleWithPenaltyVehicles.java
	jsprit-examples/src/main/java/jsprit/examples/SolomonExample.java
	jsprit-examples/src/main/java/jsprit/examples/SolomonOpenExample.java
This commit is contained in:
oblonski 2014-02-11 05:39:06 +01:00
commit 6dbcd7431a
75 changed files with 4281 additions and 525 deletions

View file

@ -18,7 +18,7 @@ package jsprit.examples;
import java.util.Collection;
import jsprit.analysis.toolbox.SolutionPlotter;
import jsprit.analysis.toolbox.Plotter;
import jsprit.analysis.toolbox.SolutionPrinter;
import jsprit.core.algorithm.VehicleRoutingAlgorithm;
import jsprit.core.algorithm.io.VehicleRoutingAlgorithms;
@ -54,7 +54,7 @@ public class SolomonR101Example {
*/
VehicleRoutingProblem vrp = vrpBuilder.build();
SolutionPlotter.plotVrpAsPNG(vrp, "output/solomon_R101.png", "R101");
new Plotter(vrp).plot("output/solomon_R101.png", "R101");
/*
* Define the required vehicle-routing algorithms to solve the above problem.
@ -85,9 +85,7 @@ public class SolomonR101Example {
/*
* Plot solution.
*/
SolutionPlotter.plotSolutionAsPNG(vrp, solution, "output/solomon_R101_solution.png","R101");
new Plotter(vrp,solution).plot( "output/solomon_R101_solution.png","R101");
}