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

remove redundant dependency apache.commons.math

Browse source
This commit is contained in:
oblonski 2016-06-21 22:47:25 +02:00
parent 3966590fc7
commit cf284ee27d
8 changed files with 64 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java
View file

@ -27,7 +27,7 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem;
import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution;
import com.graphhopper.jsprit.core.util.Resource;
import com.graphhopper.jsprit.core.util.Solutions;
import org.apache.commons.math.stat.descriptive.moment.StandardDeviation;
import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java
View file

@ -26,7 +26,7 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem;
import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution;
import com.graphhopper.jsprit.core.util.Resource;
import com.graphhopper.jsprit.core.util.Solutions;
import org.apache.commons.math.stat.descriptive.moment.StandardDeviation;
import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

8
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakScheduling.java
View file

@ -46,7 +46,7 @@ public class BreakScheduling implements InsertionStartsListener,JobInsertedListe
stateManager.removed(aBreak,inRoute);
stateManager.reCalculateStates(inRoute);
}
if(inRoute.getEnd().getArrTime() > aBreak.getTimeWindow().getEnd()){
// if(inRoute.getEnd().getArrTime() > aBreak.getTimeWindow().getEnd()){
InsertionData iData = breakInsertionCalculator.getInsertionData(inRoute, aBreak, inRoute.getVehicle(), inRoute.getDepartureTime(), inRoute.getDriver(), Double.MAX_VALUE);
if(!(iData instanceof InsertionData.NoInsertionFound)){
logger.trace("insert: [jobId={}]{}", aBreak.getId(), iData);
@ -55,7 +55,7 @@ public class BreakScheduling implements InsertionStartsListener,JobInsertedListe
}
stateManager.informJobInserted(aBreak,inRoute,0,0);
}
}
// }
}
}
@ -90,7 +90,7 @@ public class BreakScheduling implements InsertionStartsListener,JobInsertedListe
for(VehicleRoute route : vehicleRoutes){
Break aBreak = route.getVehicle().getBreak();
if(aBreak != null && !route.getTourActivities().servesJob(aBreak)){
if(route.getEnd().getArrTime() > aBreak.getTimeWindow().getEnd()){
// if(route.getEnd().getArrTime() > aBreak.getTimeWindow().getEnd()){
InsertionData iData = breakInsertionCalculator.getInsertionData(route, aBreak, route.getVehicle(), route.getDepartureTime(), route.getDriver(), Double.MAX_VALUE);
if(!(iData instanceof InsertionData.NoInsertionFound)){
logger.trace("insert: [jobId={}]{}", aBreak.getId(), iData);
@ -99,7 +99,7 @@ public class BreakScheduling implements InsertionStartsListener,JobInsertedListe
}
stateManager.informJobInserted(aBreak,route,0,0);
}
}
// }
}
}

4
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java
View file

@ -24,8 +24,8 @@ import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener;
import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem;
import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution;
import com.graphhopper.jsprit.core.util.Solutions;
import org.apache.commons.math.stat.StatUtils;
import org.apache.commons.math.stat.descriptive.moment.StandardDeviation;
import org.apache.commons.math3.stat.StatUtils;
import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/BenchmarkResult.java
View file

@ -16,7 +16,7 @@
******************************************************************************/
package com.graphhopper.jsprit.core.util;
import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
public class BenchmarkResult {