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

inspect and remove warnings

Browse source
This commit is contained in:
Stefan Schroeder 2013-12-18 17:05:19 +01:00
parent 7ec9786c2b
commit 5ff6d40d63
63 changed files with 86 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-instances/src/main/java/jsprit/instance/reader/ChristofidesReader.java
View file

@ -96,7 +96,7 @@ public class ChristofidesReader {
int demand = Integer.parseInt(tokens[2].trim());
String customer = Integer.valueOf(counter-1).toString();
Service service = Service.Builder.newInstance(customer, demand).setServiceTime(serviceTime).setCoord(customerCoord).build();
vrpBuilder.addService(service);
vrpBuilder.addJob(service);
}
counter++;
}

2
jsprit-instances/src/main/java/jsprit/instance/reader/CordeauReader.java
View file

@ -113,7 +113,7 @@ public class CordeauReader {
double serviceTime = Double.parseDouble(tokens[3].trim());
int demand = Integer.parseInt(tokens[4].trim());
Service service = Service.Builder.newInstance(id, demand).setServiceTime(serviceTime).setLocationId(id).setCoord(customerCoord).build();
vrpBuilder.addService(service);
vrpBuilder.addJob(service);
}
else if(counter <= (nOfCustomers+nOfDepots+nOfDepots)){
Coordinate depotCoord = makeCoord(tokens[1].trim(),tokens[2].trim());

28
jsprit-instances/src/main/java/jsprit/instance/reader/FigliozziReader.java
View file

@ -18,16 +18,12 @@ package jsprit.instance.reader;
import java.util.List;
import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.VehicleRoutingProblem.Builder;
import jsprit.core.problem.cost.VehicleRoutingTransportCosts;
import jsprit.core.problem.driver.Driver;
import jsprit.core.problem.vehicle.Vehicle;
import jsprit.core.util.CrowFlyCosts;
import jsprit.core.util.Locations;
import org.apache.log4j.Logger;
public class FigliozziReader {
@ -127,17 +123,17 @@ public class FigliozziReader {
}
private VehicleRoutingProblem.Builder builder;
public FigliozziReader(Builder builder) {
super();
this.builder = builder;
}
public void read(String instanceFile, String speedScenarioFile, String speedScenario){
}
// private VehicleRoutingProblem.Builder builder;
//
// public FigliozziReader(Builder builder) {
// super();
// this.builder = builder;
// }
//
// public void read(String instanceFile, String speedScenarioFile, String speedScenario){
//
//
// }
//
}

5
jsprit-instances/src/main/java/jsprit/instance/reader/LuiShenReader.java
View file

@ -23,7 +23,6 @@ import java.io.FileReader;
import java.io.IOException;
import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.VehicleRoutingProblem.FleetComposition;
import jsprit.core.problem.VehicleRoutingProblem.FleetSize;
import jsprit.core.problem.job.Service;
import jsprit.core.problem.solution.route.activity.TimeWindow;
@ -47,7 +46,7 @@ public class LuiShenReader {
public LuiShenReader(VehicleRoutingProblem.Builder vrpBuilder) {
super();
this.vrpBuilder = vrpBuilder;
this.vrpBuilder.setFleetComposition(FleetComposition.HETEROGENEOUS);
// this.vrpBuilder.setFleetComposition(FleetComposition.HETEROGENEOUS);
}
/**
@ -90,7 +89,7 @@ public class LuiShenReader {
else{
Service service = Service.Builder.newInstance("" + counter, demand).setCoord(coord).setLocationId(customerId).setServiceTime(serviceTime)
.setTimeWindow(TimeWindow.newInstance(start, end)).build();
vrpBuilder.addService(service);
vrpBuilder.addJob(service);
}
}
}

2
jsprit-instances/src/main/java/jsprit/instance/reader/SolomonReader.java
View file

@ -115,7 +115,7 @@ public class SolomonReader {
else{
Service service = Service.Builder.newInstance(customerId, demand).setCoord(coord).setLocationId(customerId).setServiceTime(serviceTime)
.setTimeWindow(TimeWindow.newInstance(start, end)).build();
vrpBuilder.addService(service);
vrpBuilder.addJob(service);
}
}
}

7
jsprit-instances/src/test/java/jsprit/instance/reader/LuiShenReaderTest.java
View file

@ -18,9 +18,7 @@ package jsprit.instance.reader;
import static org.junit.Assert.assertEquals;
import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.VehicleRoutingProblem.FleetComposition;
import jsprit.core.problem.VehicleRoutingProblem.FleetSize;
import jsprit.instance.reader.LuiShenReader;
import org.junit.Before;
import org.junit.Test;
@ -38,11 +36,6 @@ public class LuiShenReaderTest {
this.getClass().getClassLoader().getResource("C1_LuiShenVehicles.txt").getPath(), "a");
vrp = builder.build();
}
@Test
public void testFleetCompostion(){
assertEquals(FleetComposition.HETEROGENEOUS,vrp.getFleetComposition());
}
@Test
public void testFleetSize(){