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

Merge branch 'master' into vrpWithBackhauls

Browse source 
Conflicts:
	jsprit-examples/src/main/java/examples/SolomonExample.java
This commit is contained in:
oblonski 2013-08-25 18:11:40 +02:00
commit f4a7254036
99 changed files with 4371 additions and 2349 deletions
Download patch file Download diff file Expand all files Collapse all files

32
jsprit-analysis/src/main/java/analysis/SolutionPlotter.java
View file

@ -41,7 +41,9 @@ import org.jfree.data.xy.XYSeriesCollection;
import util.Coordinate;
import util.Locations;
import basics.Delivery;
import basics.Job;
import basics.Pickup;
import basics.Service;
import basics.VehicleRoutingProblem;
import basics.VehicleRoutingProblemSolution;
@ -264,13 +266,33 @@ public class SolutionPlotter {
}
coll.addSeries(vehicleSeries);
XYSeries jobSeries = new XYSeries("service", false, true);
XYSeries serviceSeries = new XYSeries("service", false, true);
XYSeries pickupSeries = new XYSeries("pickup", false, true);
XYSeries deliverySeries = new XYSeries("delivery", false, true);
for(Job job : services){
Service service = (Service)job;
Coordinate coord = service.getCoord();
jobSeries.add(coord.getX(), coord.getY());
if(job instanceof Pickup){
Pickup service = (Pickup)job;
Coordinate coord = service.getCoord();
pickupSeries.add(coord.getX(), coord.getY());
}
else if(job instanceof Delivery){
Delivery service = (Delivery)job;
Coordinate coord = service.getCoord();
deliverySeries.add(coord.getX(), coord.getY());
}
else if(job instanceof Service){
Service service = (Service)job;
Coordinate coord = service.getCoord();
serviceSeries.add(coord.getX(), coord.getY());
}
else{
throw new IllegalStateException("job instanceof " + job.getClass().toString() + ". this is not supported.");
}
}
coll.addSeries(jobSeries);
if(!serviceSeries.isEmpty()) coll.addSeries(serviceSeries);
if(!pickupSeries.isEmpty()) coll.addSeries(pickupSeries);
if(!deliverySeries.isEmpty()) coll.addSeries(deliverySeries);
return coll;
}