mirror of
https://github.com/graphhopper/jsprit.git
synced 2020-01-24 07:45:05 +01:00
improve solutionPlotter - add size-label and mark first tourAct
This commit is contained in:
parent
e7c626e785
commit
280f9e259d
1 changed files with 58 additions and 16 deletions
|
|
@ -20,7 +20,9 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package analysis;
|
package analysis;
|
||||||
|
|
||||||
|
import java.awt.BasicStroke;
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
|
import java.awt.geom.Ellipse2D;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
@ -32,10 +34,14 @@ import java.util.Set;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
import org.jfree.chart.ChartUtilities;
|
import org.jfree.chart.ChartUtilities;
|
||||||
import org.jfree.chart.JFreeChart;
|
import org.jfree.chart.JFreeChart;
|
||||||
|
import org.jfree.chart.annotations.XYShapeAnnotation;
|
||||||
import org.jfree.chart.axis.NumberAxis;
|
import org.jfree.chart.axis.NumberAxis;
|
||||||
|
import org.jfree.chart.labels.XYItemLabelGenerator;
|
||||||
import org.jfree.chart.plot.XYPlot;
|
import org.jfree.chart.plot.XYPlot;
|
||||||
import org.jfree.chart.renderer.xy.XYItemRenderer;
|
import org.jfree.chart.renderer.xy.XYItemRenderer;
|
||||||
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
|
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
|
||||||
|
import org.jfree.data.xy.XYDataItem;
|
||||||
|
import org.jfree.data.xy.XYDataset;
|
||||||
import org.jfree.data.xy.XYSeries;
|
import org.jfree.data.xy.XYSeries;
|
||||||
import org.jfree.data.xy.XYSeriesCollection;
|
import org.jfree.data.xy.XYSeriesCollection;
|
||||||
|
|
||||||
|
|
@ -82,13 +88,14 @@ public class SolutionPlotter {
|
||||||
public static void plotVrpAsPNG(VehicleRoutingProblem vrp, String pngFile, String title){
|
public static void plotVrpAsPNG(VehicleRoutingProblem vrp, String pngFile, String title){
|
||||||
log.info("plot routes to " + pngFile);
|
log.info("plot routes to " + pngFile);
|
||||||
XYSeriesCollection problem;
|
XYSeriesCollection problem;
|
||||||
|
Map<XYDataItem,String> labels = new HashMap<XYDataItem, String>();
|
||||||
try {
|
try {
|
||||||
problem = makeVrpSeries(vrp);
|
problem = makeVrpSeries(vrp, labels);
|
||||||
} catch (NoLocationFoundException e) {
|
} catch (NoLocationFoundException e) {
|
||||||
log.warn("cannot plot vrp, since coord is missing");
|
log.warn("cannot plot vrp, since coord is missing");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
XYPlot plot = createPlot(problem);
|
XYPlot plot = createPlot(problem, labels);
|
||||||
JFreeChart chart = new JFreeChart(title, plot);
|
JFreeChart chart = new JFreeChart(title, plot);
|
||||||
save(chart,pngFile);
|
save(chart,pngFile);
|
||||||
}
|
}
|
||||||
|
|
@ -105,14 +112,15 @@ public class SolutionPlotter {
|
||||||
public static void plotRoutesAsPNG(Collection<VehicleRoute> routes, Locations locations, String pngFile, String title) {
|
public static void plotRoutesAsPNG(Collection<VehicleRoute> routes, Locations locations, String pngFile, String title) {
|
||||||
log.info("plot routes to " + pngFile);
|
log.info("plot routes to " + pngFile);
|
||||||
XYSeriesCollection problem;
|
XYSeriesCollection problem;
|
||||||
|
Map<XYDataItem,String> labels = new HashMap<XYDataItem, String>();
|
||||||
try {
|
try {
|
||||||
problem = makeVrpSeries(routes);
|
problem = makeVrpSeries(routes, labels);
|
||||||
} catch (NoLocationFoundException e) {
|
} catch (NoLocationFoundException e) {
|
||||||
log.warn("cannot plot vrp, since coord is missing");
|
log.warn("cannot plot vrp, since coord is missing");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
XYSeriesCollection solutionColl = makeSolutionSeries(routes,locations);
|
XYSeriesCollection solutionColl = makeSolutionSeries(routes,locations);
|
||||||
XYPlot plot = createPlot(problem, solutionColl);
|
XYPlot plot = createPlot(problem, solutionColl, labels);
|
||||||
JFreeChart chart = new JFreeChart(title, plot);
|
JFreeChart chart = new JFreeChart(title, plot);
|
||||||
save(chart,pngFile);
|
save(chart,pngFile);
|
||||||
}
|
}
|
||||||
|
|
@ -132,14 +140,15 @@ public class SolutionPlotter {
|
||||||
log.info("plot solution to " + pngFile);
|
log.info("plot solution to " + pngFile);
|
||||||
XYSeriesCollection problem;
|
XYSeriesCollection problem;
|
||||||
XYSeriesCollection solutionColl;
|
XYSeriesCollection solutionColl;
|
||||||
|
Map<XYDataItem,String> labels = new HashMap<XYDataItem, String>();
|
||||||
try {
|
try {
|
||||||
problem = makeVrpSeries(vrp);
|
problem = makeVrpSeries(vrp, labels);
|
||||||
solutionColl = makeSolutionSeries(vrp, solution);
|
solutionColl = makeSolutionSeries(vrp, solution);
|
||||||
} catch (NoLocationFoundException e) {
|
} catch (NoLocationFoundException e) {
|
||||||
log.warn("cannot plot vrp, since coord is missing");
|
log.warn("cannot plot vrp, since coord is missing");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
XYPlot plot = createPlot(problem, solutionColl);
|
XYPlot plot = createPlot(problem, solutionColl, labels);
|
||||||
JFreeChart chart = new JFreeChart(title, plot);
|
JFreeChart chart = new JFreeChart(title, plot);
|
||||||
save(chart,pngFile);
|
save(chart,pngFile);
|
||||||
|
|
||||||
|
|
@ -147,13 +156,23 @@ public class SolutionPlotter {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private static XYPlot createPlot(XYSeriesCollection problem) {
|
private static XYPlot createPlot(final XYSeriesCollection problem, final Map<XYDataItem, String> labels) {
|
||||||
XYPlot plot = new XYPlot();
|
XYPlot plot = new XYPlot();
|
||||||
plot.setBackgroundPaint(Color.LIGHT_GRAY);
|
plot.setBackgroundPaint(Color.LIGHT_GRAY);
|
||||||
plot.setRangeGridlinePaint(Color.WHITE);
|
plot.setRangeGridlinePaint(Color.WHITE);
|
||||||
plot.setDomainGridlinePaint(Color.WHITE);
|
plot.setDomainGridlinePaint(Color.WHITE);
|
||||||
|
|
||||||
XYItemRenderer problemRenderer = new XYLineAndShapeRenderer(false, true); // Shapes only
|
XYItemRenderer problemRenderer = new XYLineAndShapeRenderer(false, true); // Shapes only
|
||||||
|
problemRenderer.setBaseItemLabelGenerator(new XYItemLabelGenerator() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String generateLabel(XYDataset arg0, int arg1, int arg2) {
|
||||||
|
XYDataItem item = problem.getSeries(arg1).getDataItem(arg2);
|
||||||
|
return labels.get(item);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
problemRenderer.setBaseItemLabelsVisible(true);
|
||||||
|
problemRenderer.setBaseItemLabelPaint(Color.BLACK);
|
||||||
|
|
||||||
NumberAxis xAxis = new NumberAxis();
|
NumberAxis xAxis = new NumberAxis();
|
||||||
xAxis.setRangeWithMargins(problem.getDomainBounds(true));
|
xAxis.setRangeWithMargins(problem.getDomainBounds(true));
|
||||||
|
|
@ -169,13 +188,24 @@ public class SolutionPlotter {
|
||||||
return plot;
|
return plot;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static XYPlot createPlot(XYSeriesCollection problem, XYSeriesCollection solutionColl) {
|
private static XYPlot createPlot(final XYSeriesCollection problem, XYSeriesCollection solutionColl, final Map<XYDataItem, String> labels) {
|
||||||
XYPlot plot = new XYPlot();
|
XYPlot plot = new XYPlot();
|
||||||
plot.setBackgroundPaint(Color.LIGHT_GRAY);
|
plot.setBackgroundPaint(Color.LIGHT_GRAY);
|
||||||
plot.setRangeGridlinePaint(Color.WHITE);
|
plot.setRangeGridlinePaint(Color.WHITE);
|
||||||
plot.setDomainGridlinePaint(Color.WHITE);
|
plot.setDomainGridlinePaint(Color.WHITE);
|
||||||
|
|
||||||
XYItemRenderer problemRenderer = new XYLineAndShapeRenderer(false, true); // Shapes only
|
XYItemRenderer problemRenderer = new XYLineAndShapeRenderer(false, true); // Shapes only
|
||||||
|
problemRenderer.setBaseItemLabelGenerator(new XYItemLabelGenerator() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String generateLabel(XYDataset arg0, int arg1, int arg2) {
|
||||||
|
XYDataItem item = problem.getSeries(arg1).getDataItem(arg2);
|
||||||
|
return labels.get(item);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
problemRenderer.setBaseItemLabelsVisible(true);
|
||||||
|
problemRenderer.setBaseItemLabelPaint(Color.BLACK);
|
||||||
|
|
||||||
|
|
||||||
NumberAxis xAxis = new NumberAxis();
|
NumberAxis xAxis = new NumberAxis();
|
||||||
xAxis.setRangeWithMargins(problem.getDomainBounds(true));
|
xAxis.setRangeWithMargins(problem.getDomainBounds(true));
|
||||||
|
|
@ -188,7 +218,13 @@ public class SolutionPlotter {
|
||||||
plot.setDomainAxis(0, xAxis);
|
plot.setDomainAxis(0, xAxis);
|
||||||
plot.setRangeAxis(0, yAxis);
|
plot.setRangeAxis(0, yAxis);
|
||||||
|
|
||||||
|
|
||||||
XYItemRenderer solutionRenderer = new XYLineAndShapeRenderer(true, false); // Lines only
|
XYItemRenderer solutionRenderer = new XYLineAndShapeRenderer(true, false); // Lines only
|
||||||
|
for(int i=0;i<solutionColl.getSeriesCount();i++){
|
||||||
|
XYSeries s = solutionColl.getSeries(i);
|
||||||
|
XYDataItem firstCustomer = s.getDataItem(1);
|
||||||
|
solutionRenderer.addAnnotation(new XYShapeAnnotation( new Ellipse2D.Double(firstCustomer.getXValue()-0.7, firstCustomer.getYValue()-0.7, 1.5, 1.5), new BasicStroke(1.0f), Color.RED));
|
||||||
|
}
|
||||||
plot.setDataset(1, solutionColl);
|
plot.setDataset(1, solutionColl);
|
||||||
plot.setRenderer(1, solutionRenderer);
|
plot.setRenderer(1, solutionRenderer);
|
||||||
plot.setDomainAxis(1, xAxis);
|
plot.setDomainAxis(1, xAxis);
|
||||||
|
|
@ -256,7 +292,7 @@ public class SolutionPlotter {
|
||||||
return coll;
|
return coll;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static XYSeriesCollection makeVrpSeries(Collection<Vehicle> vehicles, Collection<Job> services) throws NoLocationFoundException{
|
private static XYSeriesCollection makeVrpSeries(Collection<Vehicle> vehicles, Collection<Job> services, Map<XYDataItem, String> labels) throws NoLocationFoundException{
|
||||||
XYSeriesCollection coll = new XYSeriesCollection();
|
XYSeriesCollection coll = new XYSeriesCollection();
|
||||||
XYSeries vehicleSeries = new XYSeries("depot", false, true);
|
XYSeries vehicleSeries = new XYSeries("depot", false, true);
|
||||||
for(Vehicle v : vehicles){
|
for(Vehicle v : vehicles){
|
||||||
|
|
@ -273,17 +309,23 @@ public class SolutionPlotter {
|
||||||
if(job instanceof Pickup){
|
if(job instanceof Pickup){
|
||||||
Pickup service = (Pickup)job;
|
Pickup service = (Pickup)job;
|
||||||
Coordinate coord = service.getCoord();
|
Coordinate coord = service.getCoord();
|
||||||
pickupSeries.add(coord.getX(), coord.getY());
|
XYDataItem dataItem = new XYDataItem(coord.getX(), coord.getY());
|
||||||
|
pickupSeries.add(dataItem);
|
||||||
|
labels.put(dataItem, String.valueOf(service.getCapacityDemand()));
|
||||||
}
|
}
|
||||||
else if(job instanceof Delivery){
|
else if(job instanceof Delivery){
|
||||||
Delivery service = (Delivery)job;
|
Delivery service = (Delivery)job;
|
||||||
Coordinate coord = service.getCoord();
|
Coordinate coord = service.getCoord();
|
||||||
deliverySeries.add(coord.getX(), coord.getY());
|
XYDataItem dataItem = new XYDataItem(coord.getX(), coord.getY());
|
||||||
|
deliverySeries.add(dataItem);
|
||||||
|
labels.put(dataItem, String.valueOf(service.getCapacityDemand()));
|
||||||
}
|
}
|
||||||
else if(job instanceof Service){
|
else if(job instanceof Service){
|
||||||
Service service = (Service)job;
|
Service service = (Service)job;
|
||||||
Coordinate coord = service.getCoord();
|
Coordinate coord = service.getCoord();
|
||||||
serviceSeries.add(coord.getX(), coord.getY());
|
XYDataItem dataItem = new XYDataItem(coord.getX(), coord.getY());
|
||||||
|
serviceSeries.add(dataItem);
|
||||||
|
labels.put(dataItem, String.valueOf(service.getCapacityDemand()));
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
throw new IllegalStateException("job instanceof " + job.getClass().toString() + ". this is not supported.");
|
throw new IllegalStateException("job instanceof " + job.getClass().toString() + ". this is not supported.");
|
||||||
|
|
@ -296,18 +338,18 @@ public class SolutionPlotter {
|
||||||
return coll;
|
return coll;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static XYSeriesCollection makeVrpSeries(Collection<VehicleRoute> routes) throws NoLocationFoundException{
|
private static XYSeriesCollection makeVrpSeries(Collection<VehicleRoute> routes, Map<XYDataItem, String> labels) throws NoLocationFoundException{
|
||||||
Set<Vehicle> vehicles = new HashSet<Vehicle>();
|
Set<Vehicle> vehicles = new HashSet<Vehicle>();
|
||||||
Set<Job> jobs = new HashSet<Job>();
|
Set<Job> jobs = new HashSet<Job>();
|
||||||
for(VehicleRoute route : routes){
|
for(VehicleRoute route : routes){
|
||||||
vehicles.add(route.getVehicle());
|
vehicles.add(route.getVehicle());
|
||||||
jobs.addAll(route.getTourActivities().getJobs());
|
jobs.addAll(route.getTourActivities().getJobs());
|
||||||
}
|
}
|
||||||
return makeVrpSeries(vehicles, jobs);
|
return makeVrpSeries(vehicles, jobs, labels);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static XYSeriesCollection makeVrpSeries(VehicleRoutingProblem vrp) throws NoLocationFoundException{
|
private static XYSeriesCollection makeVrpSeries(VehicleRoutingProblem vrp, Map<XYDataItem, String> labels) throws NoLocationFoundException{
|
||||||
return makeVrpSeries(vrp.getVehicles(), vrp.getJobs().values());
|
return makeVrpSeries(vrp.getVehicles(), vrp.getJobs().values(), labels);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Locations retrieveLocations(VehicleRoutingProblem vrp) throws NoLocationFoundException {
|
private static Locations retrieveLocations(VehicleRoutingProblem vrp) throws NoLocationFoundException {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue