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

rm ToDos

Browse source
This commit is contained in:
oblonski 2015-04-24 16:07:26 +02:00
parent 7b578d3ce6
commit 4757753f26
14 changed files with 25 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java
View file

@ -39,7 +39,7 @@ public interface SolutionAcceptor {
*
* @param solutions collection of existing solutions
* @param newSolution new solution to be evaluated
* @return TODO
* @return true if solution accepted
*/
public boolean acceptSolution(Collection<VehicleRoutingProblemSolution> solutions, VehicleRoutingProblemSolution newSolution);

2
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java
View file

@ -43,7 +43,7 @@ public class DellAmicoFixCostCalculator implements SoftRouteConstraint, Insertio
}
@Override
public double getCosts(JobInsertionContext insertionContext) {// TODO Auto-generated method stub
public double getCosts(JobInsertionContext insertionContext) {
return calculator.getCosts(insertionContext);
}

3
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java
View file

@ -47,8 +47,7 @@ class Inserter {
@Override
public void setNextHandler(JobInsertionHandler handler) {
// TODO Auto-generated method stub
}
}

6
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java
View file

@ -112,7 +112,7 @@ public class JobInsertionCostsCalculatorBuilder {
/**
* Sets activityStates. MUST be set.
* @param stateManager TODO
* @param stateManager
*
* @return
*/
@ -147,7 +147,7 @@ public class JobInsertionCostsCalculatorBuilder {
* Sets a flag to build a calculator based on local calculations.
*
* <p>Insertion of a job and job-activity is evaluated based on the previous and next activity.
* @param addDefaultCostCalc TODO
* @param addDefaultCostCalc
*/
public JobInsertionCostsCalculatorBuilder setLocalLevel(boolean addDefaultCostCalc){
local = true;
@ -165,7 +165,7 @@ public class JobInsertionCostsCalculatorBuilder {
*
* @param forwardLooking
* @param memory
* @param addDefaultMarginalCostCalc TODO
* @param addDefaultMarginalCostCalc
*/
public JobInsertionCostsCalculatorBuilder setRouteLevel(int forwardLooking, int memory, boolean addDefaultMarginalCostCalc){
local = false;

2
jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java
View file

@ -119,7 +119,7 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr
routingCosts.getBackwardTransportTime(newAct.getLocation(),nextActLocation,latestArrTimeAtNextAct,iFacts.getNewDriver(),iFacts.getNewVehicle())
- newAct.getOperationTime()
);
//ToDo: SUSPICIOUS - hier muss noch operation time weg
/*
* |--- prevAct ---|
* |--- vehicle's arrival @newAct

7
jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java
View file

@ -53,10 +53,9 @@ public interface VehicleRoutingActivityCosts {
* @param tourAct
* @param arrivalTime is actually the arrival time at this tourActivity, which must not nessecarrily be the operation start time. If the theoretical earliest
* operation start time at this activity is later than actualStartTime, the driver must wait at this activity.
* @param driver TODO
* @param vehicle TODO
* @param earliestStartTime, this is the practical earliest operation start time which considers also previous activities.
* @param latestStartTime, this is the practical latest operation start time which consider also future activities in the tour.
* @param driver
* @param vehicle
*
* if earliestStartTime > latestStartTime activity operations cannot be conducted within the given time-window.
* @return
*/

2
jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java
View file

@ -137,10 +137,8 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT {
readDemandQuantities(vrpBuilder);
readDistances(matrixBuilder);
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

2
jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java
View file

@ -137,10 +137,8 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndD
readDemandQuantities(vrpBuilder);
readDistances(matrixBuilder);
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

20
jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java
View file

@ -72,15 +72,13 @@ public class SearchStrategyTest {
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
@Override
public void addModuleListener(
SearchStrategyModuleListener moduleListener) {
// TODO Auto-generated method stub
}
};
strat.addModule(mod);
@ -114,15 +112,13 @@ public class SearchStrategyTest {
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
@Override
public void addModuleListener(
SearchStrategyModuleListener moduleListener) {
// TODO Auto-generated method stub
}
};
SearchStrategyModule mod2 = new SearchStrategyModule() {
@ -135,15 +131,13 @@ public class SearchStrategyTest {
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
@Override
public void addModuleListener(
SearchStrategyModuleListener moduleListener) {
// TODO Auto-generated method stub
}
};
strat.addModule(mod);
@ -181,15 +175,13 @@ public class SearchStrategyTest {
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
@Override
public void addModuleListener(
SearchStrategyModuleListener moduleListener) {
// TODO Auto-generated method stub
}
};
strat.addModule(mod);
@ -225,15 +217,13 @@ public class SearchStrategyTest {
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
@Override
public void addModuleListener(
SearchStrategyModuleListener moduleListener) {
// TODO Auto-generated method stub
}
};
strat.addModule(mod);

15
jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java
View file

@ -191,32 +191,27 @@ public class TestAlgorithmReader {
@Override
public Collection<Job> ruin(Collection<VehicleRoute> vehicleRoutes) {
// TODO Auto-generated method stub
return null;
}
@Override
public Collection<Job> ruin(Collection<VehicleRoute> vehicleRoutes,
Job targetJob, int nOfJobs2BeRemoved) {
// TODO Auto-generated method stub
return null;
}
@Override
public void addListener(RuinListener ruinListener) {
// TODO Auto-generated method stub
}
@Override
public void removeListener(RuinListener ruinListener) {
// TODO Auto-generated method stub
}
@Override
public Collection<RuinListener> getListeners() {
// TODO Auto-generated method stub
return null;
}
@ -232,17 +227,15 @@ public class TestAlgorithmReader {
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
@Override
public void addModuleListener(
SearchStrategyModuleListener moduleListener) {
// TODO Auto-generated method stub
}
};;;
};
typedMap.put(accKey, acceptor);
typedMap.put(moduleKey, stratModule);

4
jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java
View file

@ -38,7 +38,6 @@ public class TestJobDistanceAvgCosts {
@Override
public double getBackwardTransportCost(Location from, Location to,
double arrivalTime, Driver driver, Vehicle vehicle) {
// TODO Auto-generated method stub
return 0;
}
@ -53,7 +52,6 @@ public class TestJobDistanceAvgCosts {
@Override
public double getTransportTime(Location from, Location to,
double departureTime, Driver driver, Vehicle vehicle) {
// TODO Auto-generated method stub
return 0;
}
};
@ -75,7 +73,6 @@ public class TestJobDistanceAvgCosts {
@Override
public double getBackwardTransportCost(Location from, Location to,
double arrivalTime, Driver driver, Vehicle vehicle) {
// TODO Auto-generated method stub
return 0;
}
@ -90,7 +87,6 @@ public class TestJobDistanceAvgCosts {
@Override
public double getTransportTime(Location from, Location to,
double departureTime, Driver driver, Vehicle vehicle) {
// TODO Auto-generated method stub
return 0;
}
};