diff --git a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java index cb33eff6..383f32e0 100644 --- a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/AlgorithmSearchProgressChartListener.java @@ -22,8 +22,8 @@ import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; import com.graphhopper.jsprit.core.algorithm.listener.IterationEndsListener; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; @@ -38,7 +38,7 @@ import java.util.Collection; public class AlgorithmSearchProgressChartListener implements IterationEndsListener, AlgorithmEndsListener, AlgorithmStartsListener { - private static Logger log = LogManager.getLogger(AlgorithmSearchProgressChartListener.class); + private static Logger log = LoggerFactory.getLogger(AlgorithmSearchProgressChartListener.class); private String filename; diff --git a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ConcurrentBenchmarker.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ConcurrentBenchmarker.java index e687e69d..30174ae6 100644 --- a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ConcurrentBenchmarker.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/ConcurrentBenchmarker.java @@ -69,7 +69,7 @@ public class ConcurrentBenchmarker { public ConcurrentBenchmarker(String algorithmConfig) { super(); this.algorithmConfig = algorithmConfig; -// LogManager.getRootLogger().setLevel(Level.ERROR); +// LoggerFactory.getRootLogger().setLevel(Level.ERROR); } public ConcurrentBenchmarker(VehicleRoutingAlgorithmFactory algorithmFactory) { diff --git a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java index fae7a385..2cbdc915 100644 --- a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java @@ -24,8 +24,6 @@ import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.util.Coordinate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.jfree.chart.*; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.labels.XYItemLabelGenerator; @@ -40,6 +38,8 @@ import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; import org.jfree.ui.RectangleEdge; import org.jfree.util.ShapeUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.awt.*; import java.awt.geom.Ellipse2D; @@ -139,7 +139,7 @@ public class Plotter { } - private static Logger log = LogManager.getLogger(Plotter.class); + private static Logger log = LoggerFactory.getLogger(Plotter.class); /** * Label to label ID (=jobId), SIZE (=jobSize=jobCapacityDimensions) @@ -453,8 +453,9 @@ public class Plotter { ChartUtilities.saveChartAsPNG(new File(pngFile), chart, 1000, 600); } catch (IOException e) { log.error("cannot plot"); - log.error(e); + log.error(e.toString()); e.printStackTrace(); + throw new RuntimeException(e); } } diff --git a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/StopWatch.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/StopWatch.java index 22b96e48..c2a7d609 100644 --- a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/StopWatch.java +++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/StopWatch.java @@ -21,15 +21,15 @@ import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmEndsListener; import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; public class StopWatch implements AlgorithmStartsListener, AlgorithmEndsListener { - private static Logger log = LogManager.getLogger(StopWatch.class); + private static Logger log = LoggerFactory.getLogger(StopWatch.class); private double ran; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/InsertionInitialSolutionFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/InsertionInitialSolutionFactory.java index f2fae100..23d7925d 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/InsertionInitialSolutionFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/InsertionInitialSolutionFactory.java @@ -25,8 +25,8 @@ import com.graphhopper.jsprit.core.problem.solution.InitialSolutionFactory; import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -35,7 +35,7 @@ import java.util.List; public final class InsertionInitialSolutionFactory implements InitialSolutionFactory { - private static final Logger logger = LogManager.getLogger(InsertionInitialSolutionFactory.class); + private static final Logger logger = LoggerFactory.getLogger(InsertionInitialSolutionFactory.class); private final InsertionStrategy insertion; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategy.java index c1488458..160a20ce 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategy.java @@ -22,8 +22,8 @@ import com.graphhopper.jsprit.core.algorithm.selector.SolutionSelector; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -65,7 +65,7 @@ public class SearchStrategy { } } - private static Logger logger = LogManager.getLogger(SearchStrategy.class); + private static Logger logger = LoggerFactory.getLogger(SearchStrategy.class); private final Collection searchStrategyModules = new ArrayList(); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManager.java index f02bb8cb..6129da62 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/SearchStrategyManager.java @@ -19,15 +19,15 @@ package com.graphhopper.jsprit.core.algorithm; import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyListener; import com.graphhopper.jsprit.core.algorithm.listener.SearchStrategyModuleListener; import com.graphhopper.jsprit.core.util.RandomNumberGeneration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; public class SearchStrategyManager { - private final static Logger logger = LogManager.getLogger(); + private final static Logger logger = LoggerFactory.getLogger(SearchStrategyManager.class); private List searchStrategyListeners = new ArrayList(); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java index 47a89107..94b45359 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java @@ -28,8 +28,8 @@ import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolutio import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.util.Solutions; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -65,7 +65,7 @@ public class VehicleRoutingAlgorithm { private final String name; private long counter = 0; private long nextCounter = 1; - private static final Logger log = LogManager.getLogger(Counter.class); + private static final Logger log = LoggerFactory.getLogger(Counter.class); public Counter(final String name) { this.name = name; @@ -86,7 +86,7 @@ public class VehicleRoutingAlgorithm { } } - private final static Logger logger = LogManager.getLogger(); + private final static Logger logger = LoggerFactory.getLogger(VehicleRoutingAlgorithm.class); private final Counter counter = new Counter("iterations "); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java index 22592250..7dc067df 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/ExperimentalSchrimpfAcceptance.java @@ -28,8 +28,8 @@ import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolutio 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.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.URL; import java.util.Collection; @@ -37,7 +37,7 @@ import java.util.Collection; public class ExperimentalSchrimpfAcceptance implements SolutionAcceptor, IterationStartsListener, AlgorithmStartsListener { - final static Logger logger = LogManager.getLogger(ExperimentalSchrimpfAcceptance.class.getName()); + final static Logger logger = LoggerFactory.getLogger(ExperimentalSchrimpfAcceptance.class.getName()); private final double alpha; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java index 22d56f70..25ad6f9c 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfAcceptance.java @@ -21,8 +21,8 @@ import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; import com.graphhopper.jsprit.core.algorithm.listener.IterationStartsListener; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; @@ -65,7 +65,7 @@ import java.util.Collection; */ public class SchrimpfAcceptance implements SolutionAcceptor, IterationStartsListener, AlgorithmStartsListener { - private static Logger logger = LogManager.getLogger(SchrimpfAcceptance.class.getName()); + private static Logger logger = LoggerFactory.getLogger(SchrimpfAcceptance.class.getName()); private final double alpha; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java index 824aee6d..c5391134 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/acceptor/SchrimpfInitialThresholdGenerator.java @@ -27,15 +27,15 @@ import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolutio 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.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.URL; import java.util.Collection; public class SchrimpfInitialThresholdGenerator implements AlgorithmStartsListener { - private static Logger logger = LogManager.getLogger(SchrimpfInitialThresholdGenerator.class.getName()); + private static Logger logger = LoggerFactory.getLogger(SchrimpfInitialThresholdGenerator.class.getName()); private SchrimpfAcceptance schrimpfAcceptance; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java index ee736162..d0b5c06f 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/AlgorithmConfigXmlReader.java @@ -18,8 +18,8 @@ package com.graphhopper.jsprit.core.algorithm.io; import com.graphhopper.jsprit.core.util.Resource; import org.apache.commons.configuration.ConfigurationException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -31,7 +31,7 @@ import java.net.URL; public class AlgorithmConfigXmlReader { - private static Logger log = LogManager.getLogger(AlgorithmConfigXmlReader.class.getName()); + private static Logger log = LoggerFactory.getLogger(AlgorithmConfigXmlReader.class.getName()); private AlgorithmConfig algorithmConfig; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/InsertionFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/InsertionFactory.java index a9c522f0..ed390c1d 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/InsertionFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/InsertionFactory.java @@ -24,8 +24,8 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.concurrent.ExecutorService; @@ -33,7 +33,7 @@ import java.util.concurrent.ExecutorService; class InsertionFactory { - private static Logger log = LogManager.getLogger(InsertionFactory.class.getName()); + private static Logger log = LoggerFactory.getLogger(InsertionFactory.class.getName()); @SuppressWarnings("deprecation") public static InsertionStrategy createInsertion(VehicleRoutingProblem vrp, HierarchicalConfiguration config, diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java index 17dabce5..f6d0430d 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java @@ -53,8 +53,8 @@ import com.graphhopper.jsprit.core.problem.vehicle.*; import com.graphhopper.jsprit.core.util.ActivityTimeTracker; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.lang.Thread.UncaughtExceptionHandler; import java.net.URL; @@ -347,7 +347,7 @@ public class VehicleRoutingAlgorithms { } - private static Logger log = LogManager.getLogger(VehicleRoutingAlgorithms.class.getName()); + private static Logger log = LoggerFactory.getLogger(VehicleRoutingAlgorithms.class.getName()); private VehicleRoutingAlgorithms() { } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java index 4b8a115d..5b0f101d 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AbstractInsertionStrategy.java @@ -26,8 +26,8 @@ import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.util.RandomNumberGeneration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; import java.util.Collections; @@ -57,7 +57,7 @@ public abstract class AbstractInsertionStrategy implements InsertionStrategy { } - private final static Logger logger = LogManager.getLogger(); + private final static Logger logger = LoggerFactory.getLogger(AbstractInsertionStrategy.class); protected Random random = RandomNumberGeneration.getRandom(); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java index d26a17f3..d862b78a 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertion.java @@ -20,8 +20,8 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.util.NoiseMaker; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -33,7 +33,7 @@ import java.util.*; */ public final class BestInsertion extends AbstractInsertionStrategy { - private static Logger logger = LogManager.getLogger(BestInsertion.class); + private static Logger logger = LoggerFactory.getLogger(BestInsertion.class); private JobInsertionCostsCalculator bestInsertionCostCalculator; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java index 76450c73..d2b80012 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java @@ -23,8 +23,8 @@ import com.graphhopper.jsprit.core.problem.driver.Driver; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.*; @@ -63,7 +63,7 @@ public final class BestInsertionConcurrent extends AbstractInsertionStrategy { } - private static Logger logger = LogManager.getLogger(BestInsertionConcurrent.class); + private static Logger logger = LoggerFactory.getLogger(BestInsertionConcurrent.class); private final static double NO_NEW_DEPARTURE_TIME_YET = -12345.12345; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java index 0d0e2408..1b25df7e 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java @@ -32,8 +32,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.End; import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Arrays; import java.util.Iterator; @@ -46,7 +46,7 @@ import java.util.List; */ final class BreakInsertionCalculator implements JobInsertionCostsCalculator { - private static final Logger logger = LogManager.getLogger(BreakInsertionCalculator.class); + private static final Logger logger = LoggerFactory.getLogger(BreakInsertionCalculator.class); private HardRouteConstraint hardRouteLevelConstraint; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakScheduling.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakScheduling.java index f2d1328b..5d571c02 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakScheduling.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakScheduling.java @@ -9,8 +9,8 @@ import com.graphhopper.jsprit.core.problem.constraint.ConstraintManager; import com.graphhopper.jsprit.core.problem.job.Break; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -19,7 +19,7 @@ import java.util.*; */ public class BreakScheduling implements InsertionStartsListener,JobInsertedListener, RuinListener { - private final static Logger logger = LogManager.getLogger(); + private final static Logger logger = LoggerFactory.getLogger(BreakScheduling.class); private final StateManager stateManager; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java index 2bef8fd1..5bda3164 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeScheduling.java @@ -6,8 +6,8 @@ import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.util.RandomNumberGeneration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -42,7 +42,7 @@ class CalculatesServiceInsertionWithTimeScheduling implements JobInsertionCostsC } } - private static Logger log = LogManager.getLogger(CalculatesServiceInsertionWithTimeScheduling.class); + private static Logger log = LoggerFactory.getLogger(CalculatesServiceInsertionWithTimeScheduling.class); private JobInsertionCostsCalculator jic; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java index cfaff58d..7ff05c86 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/CalculatesServiceInsertionWithTimeSchedulingInSlices.java @@ -20,8 +20,8 @@ import com.graphhopper.jsprit.core.problem.driver.Driver; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ import java.util.List; class CalculatesServiceInsertionWithTimeSchedulingInSlices implements JobInsertionCostsCalculator { - private static Logger log = LogManager.getLogger(CalculatesServiceInsertionWithTimeSchedulingInSlices.class); + private static Logger log = LoggerFactory.getLogger(CalculatesServiceInsertionWithTimeSchedulingInSlices.class); private JobInsertionCostsCalculator jic; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreakListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreakListener.java index 4d8d24f2..88f7607c 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreakListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertBreakListener.java @@ -1,15 +1,16 @@ package com.graphhopper.jsprit.core.algorithm.recreate; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Created by schroeder on 19/05/15. */ class InsertBreakListener implements EventListener { - private static final Logger logger = LogManager.getLogger(); + private static final Logger logger = LoggerFactory.getLogger(InsertBreakListener.class); @Override public void inform(Event event) { diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java index d5de17de..07d47d5d 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionConsideringFixCostsCalculator.java @@ -26,12 +26,13 @@ import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + final class JobInsertionConsideringFixCostsCalculator implements JobInsertionCostsCalculator, SoftRouteConstraint { - private static final Logger logger = LogManager.getLogger(JobInsertionConsideringFixCostsCalculator.class); + private static final Logger logger = LoggerFactory.getLogger(JobInsertionConsideringFixCostsCalculator.class); private final JobInsertionCostsCalculator standardServiceInsertion; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertion.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertion.java index 2bb93b4e..2496c7ed 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertion.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertion.java @@ -21,8 +21,8 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Break; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -43,7 +43,7 @@ public class RegretInsertion extends AbstractInsertionStrategy { - private static Logger logger = LogManager.getLogger(RegretInsertionFast.class); + private static Logger logger = LoggerFactory.getLogger(RegretInsertionFast.class); private ScoringFunction scoringFunction; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java index d61fdac8..3d227e68 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrent.java @@ -21,8 +21,8 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Break; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -43,7 +43,7 @@ import java.util.concurrent.*; public class RegretInsertionConcurrent extends AbstractInsertionStrategy { - private static Logger logger = LogManager.getLogger(RegretInsertionConcurrentFast.class); + private static Logger logger = LoggerFactory.getLogger(RegretInsertionConcurrentFast.class); private ScoringFunction scoringFunction; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java index 522fa4de..d246176e 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java @@ -22,8 +22,8 @@ import com.graphhopper.jsprit.core.problem.job.Break; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.Callable; @@ -43,7 +43,7 @@ import java.util.concurrent.Future; public class RegretInsertionConcurrentFast extends AbstractInsertionStrategy { - private static Logger logger = LogManager.getLogger(RegretInsertionConcurrentFast.class); + private static Logger logger = LoggerFactory.getLogger(RegretInsertionConcurrentFast.class); private ScoringFunction scoringFunction; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java index 298aa638..eacfbbe4 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionFast.java @@ -22,8 +22,8 @@ import com.graphhopper.jsprit.core.problem.job.Break; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -39,7 +39,7 @@ import java.util.*; */ public class RegretInsertionFast extends AbstractInsertionStrategy { - private static Logger logger = LogManager.getLogger(RegretInsertionFast.class); + private static Logger logger = LoggerFactory.getLogger(RegretInsertionFast.class); private ScoringFunction scoringFunction; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java index db4b3dce..b16e7270 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java @@ -32,8 +32,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Iterator; @@ -44,7 +44,7 @@ import java.util.Iterator; */ final class ServiceInsertionCalculator implements JobInsertionCostsCalculator { - private static final Logger logger = LogManager.getLogger(ServiceInsertionCalculator.class); + private static final Logger logger = LoggerFactory.getLogger(ServiceInsertionCalculator.class); private HardRouteConstraint hardRouteLevelConstraint; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java index aafd487e..28f2b255 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java @@ -36,8 +36,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Comparator; @@ -47,7 +47,7 @@ import java.util.PriorityQueue; final class ServiceInsertionOnRouteLevelCalculator implements JobInsertionCostsCalculator { - private static final Logger logger = LogManager.getLogger(ServiceInsertionOnRouteLevelCalculator.class); + private static final Logger logger = LoggerFactory.getLogger(ServiceInsertionOnRouteLevelCalculator.class); private final VehicleRoutingTransportCosts transportCosts; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java index b1b68531..4cea68af 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java @@ -32,15 +32,15 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator { - private static final Logger logger = LogManager.getLogger(ShipmentInsertionCalculator.class); + private static final Logger logger = LoggerFactory.getLogger(ShipmentInsertionCalculator.class); private HardRouteConstraint hardRouteLevelConstraint; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicleListener.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicleListener.java index 15a45ba0..0f84b627 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicleListener.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/SwitchVehicleListener.java @@ -1,15 +1,16 @@ package com.graphhopper.jsprit.core.algorithm.recreate; import com.graphhopper.jsprit.core.problem.job.Break; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Created by schroeder on 19/05/15. */ class SwitchVehicleListener implements EventListener { - private static final Logger logger = LogManager.getLogger(); + private static final Logger logger = LoggerFactory.getLogger(SwitchVehicleListener.class); @Override public void inform(Event event) { diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java index 34082832..f4c9afda 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java @@ -23,8 +23,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -34,7 +34,7 @@ import java.util.Set; final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCostsCalculator { - private Logger logger = LogManager.getLogger(VehicleTypeDependentJobInsertionCalculator.class); + private Logger logger = LoggerFactory.getLogger(VehicleTypeDependentJobInsertionCalculator.class); private final VehicleFleetManager fleetManager; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java index 65f72967..8b672bf9 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/AbstractRuinStrategy.java @@ -24,15 +24,15 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.util.RandomNumberGeneration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; import java.util.Random; public abstract class AbstractRuinStrategy implements RuinStrategy { - private final static Logger logger = LogManager.getLogger(); + private final static Logger logger = LoggerFactory.getLogger(AbstractRuinStrategy.class); private RuinListeners ruinListeners; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java index cc475d9f..6ab46563 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImpl.java @@ -4,8 +4,8 @@ import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.util.StopWatch; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -14,7 +14,7 @@ import java.util.*; */ class JobNeighborhoodsImpl implements JobNeighborhoods { - private static Logger logger = LogManager.getLogger(JobNeighborhoodsImpl.class); + private static Logger logger = LoggerFactory.getLogger(JobNeighborhoodsImpl.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java index af6e143e..bb3f9f2f 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsImplWithCapRestriction.java @@ -4,8 +4,8 @@ import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.util.StopWatch; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -14,7 +14,7 @@ import java.util.*; */ class JobNeighborhoodsImplWithCapRestriction implements JobNeighborhoods { - private static Logger logger = LogManager.getLogger(JobNeighborhoodsImpl.class); + private static Logger logger = LoggerFactory.getLogger(JobNeighborhoodsImpl.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java index 308931b3..9a15d515 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java @@ -1,8 +1,8 @@ package com.graphhopper.jsprit.core.algorithm.ruin; import com.graphhopper.jsprit.core.problem.job.Job; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Iterator; @@ -11,7 +11,7 @@ import java.util.Iterator; */ class NearestNeighborhoodIterator implements Iterator { - private static Logger log = LogManager.getLogger(NearestNeighborhoodIterator.class); + private static Logger log = LoggerFactory.getLogger(NearestNeighborhoodIterator.class); private Iterator jobIter; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreaks.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreaks.java index ee0cb295..b96c9e5e 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreaks.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinBreaks.java @@ -4,8 +4,8 @@ import com.graphhopper.jsprit.core.algorithm.ruin.listener.RuinListener; import com.graphhopper.jsprit.core.problem.job.Break; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; @@ -14,7 +14,7 @@ import java.util.Collection; */ public class RuinBreaks implements RuinListener { - private final static Logger logger = LogManager.getLogger(); + private final static Logger logger = LoggerFactory.getLogger(RuinBreaks.class); @Override public void ruinStarts(Collection routes) { diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClusters.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClusters.java index 6a0d6c79..978add7c 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClusters.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinClusters.java @@ -24,8 +24,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.util.RandomUtils; import org.apache.commons.math3.ml.clustering.Clusterable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -63,7 +63,7 @@ public final class RuinClusters extends AbstractRuinStrategy implements Iteratio } } - private Logger logger = LogManager.getLogger(RuinClusters.class); + private Logger logger = LoggerFactory.getLogger(RuinClusters.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadial.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadial.java index cf87c739..9514a95a 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadial.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadial.java @@ -21,8 +21,8 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.util.RandomUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -36,7 +36,7 @@ import java.util.*; */ public final class RuinRadial extends AbstractRuinStrategy { - private Logger logger = LogManager.getLogger(RuinRadial.class); + private Logger logger = LoggerFactory.getLogger(RuinRadial.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java index ae654f43..c0457b0f 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRadialMultipleCenters.java @@ -20,8 +20,8 @@ import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -36,7 +36,7 @@ import java.util.*; @Deprecated public final class RuinRadialMultipleCenters extends AbstractRuinStrategy { - private Logger logger = LogManager.getLogger(RuinRadialMultipleCenters.class); + private Logger logger = LoggerFactory.getLogger(RuinRadialMultipleCenters.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRandom.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRandom.java index 06824677..8f226c1e 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRandom.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinRandom.java @@ -19,8 +19,8 @@ package com.graphhopper.jsprit.core.algorithm.ruin; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -37,7 +37,7 @@ import java.util.List; public final class RuinRandom extends AbstractRuinStrategy { - private Logger logger = LogManager.getLogger(RuinRandom.class); + private Logger logger = LoggerFactory.getLogger(RuinRandom.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorst.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorst.java index 5a17c94f..d3a876ca 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorst.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinWorst.java @@ -23,8 +23,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.util.NoiseMaker; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -38,7 +38,7 @@ import java.util.*; public final class RuinWorst extends AbstractRuinStrategy { - private Logger logger = LogManager.getLogger(RuinWorst.class); + private Logger logger = LoggerFactory.getLogger(RuinWorst.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java index 18d3907a..1772908d 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/IterationWithoutImprovementTermination.java @@ -17,8 +17,9 @@ package com.graphhopper.jsprit.core.algorithm.termination; import com.graphhopper.jsprit.core.algorithm.SearchStrategy; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Terminates algorithm prematurely based on iterations without any improvement (i.e. new solution acceptance). @@ -31,7 +32,7 @@ import org.apache.logging.log4j.Logger; */ public class IterationWithoutImprovementTermination implements PrematureAlgorithmTermination { - private static Logger log = LogManager.getLogger(IterationWithoutImprovementTermination.class); + private static Logger log = LoggerFactory.getLogger(IterationWithoutImprovementTermination.class); private int noIterationWithoutImprovement; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTermination.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTermination.java index 14bf6a6a..1688d600 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTermination.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/TimeTermination.java @@ -21,8 +21,8 @@ import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; import com.graphhopper.jsprit.core.algorithm.listener.AlgorithmStartsListener; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; @@ -46,7 +46,7 @@ public class TimeTermination implements PrematureAlgorithmTermination, Algorithm } - private static Logger logger = LogManager.getLogger(TimeTermination.class); + private static Logger logger = LoggerFactory.getLogger(TimeTermination.class); private final long timeThreshold; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java index b8fa7bd4..e1a11990 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/termination/VariationCoefficientTermination.java @@ -26,8 +26,8 @@ import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolutio 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.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; @@ -45,7 +45,7 @@ import java.util.Collection; */ public class VariationCoefficientTermination implements PrematureAlgorithmTermination, IterationStartsListener, AlgorithmStartsListener, IterationEndsListener { - private final static Logger logger = LogManager.getLogger(VariationCoefficientTermination.class); + private final static Logger logger = LoggerFactory.getLogger(VariationCoefficientTermination.class); private final int noIterations; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java index d83ce8a1..dc56fdc6 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java @@ -29,8 +29,8 @@ import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolutio import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.*; import com.graphhopper.jsprit.core.util.ActivityTimeTracker; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Map; @@ -437,7 +437,7 @@ public class SolutionAnalyser { } } - private static final Logger log = LogManager.getLogger(SolutionAnalyser.class); + private static final Logger log = LoggerFactory.getLogger(SolutionAnalyser.class); private VehicleRoutingProblem vrp; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java index e8e201a2..8a69ff21 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java @@ -33,12 +33,13 @@ import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeKey; import com.graphhopper.jsprit.core.util.Coordinate; import com.graphhopper.jsprit.core.util.CrowFlyCosts; import com.graphhopper.jsprit.core.util.Locations; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; + /** * Contains and defines the vehicle routing problem. *

@@ -516,7 +517,7 @@ public class VehicleRoutingProblem { /** * logger logging for this class */ - private final static Logger logger = LogManager.getLogger(VehicleRoutingProblem.class); + private final static Logger logger = LoggerFactory.getLogger(VehicleRoutingProblem.class); /** * contains transportation costs, i.e. the costs traveling from location A to B diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java index 0c316037..6ac536dd 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java @@ -20,8 +20,8 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -39,7 +39,7 @@ public class ConstraintManager implements HardActivityConstraint, HardRouteConst CRITICAL, HIGH, LOW } - private static Logger log = LogManager.getLogger(ConstraintManager.class); + private static Logger log = LoggerFactory.getLogger(ConstraintManager.class); private HardActivityLevelConstraintManager actLevelConstraintManager = new HardActivityLevelConstraintManager(); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReader.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReader.java index 1394c5bf..e3ae4ded 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReader.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLReader.java @@ -35,8 +35,8 @@ import com.graphhopper.jsprit.core.util.Resource; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -69,7 +69,7 @@ public class VrpXMLReader { } } - private static Logger logger = LogManager.getLogger(VrpXMLReader.class); + private static Logger logger = LoggerFactory.getLogger(VrpXMLReader.class); private VehicleRoutingProblem.Builder vrpBuilder; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriter.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriter.java index 0608f188..cf6b04b5 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriter.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/io/VrpXMLWriter.java @@ -30,13 +30,12 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; import com.graphhopper.jsprit.core.util.Solutions; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -63,7 +62,7 @@ public class VrpXMLWriter { } } - private Logger log = LogManager.getLogger(VrpXMLWriter.class); + private Logger log = LoggerFactory.getLogger(VrpXMLWriter.class); private VehicleRoutingProblem vrp; @@ -87,7 +86,7 @@ public class VrpXMLWriter { this.solutions = null; } - private static Logger logger = LogManager.getLogger(VrpXMLWriter.class); + private static Logger logger = LoggerFactory.getLogger(VrpXMLWriter.class); public void write(String filename) { if (!filename.endsWith(".xml")) filename += ".xml"; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java index 24cdc29f..26bebbe2 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java @@ -16,8 +16,11 @@ ******************************************************************************/ package com.graphhopper.jsprit.core.problem.vehicle; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; + + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -25,9 +28,10 @@ import java.util.HashMap; import java.util.Map; + class InfiniteVehicles implements VehicleFleetManager { - private static Logger logger = LogManager.getLogger(InfiniteVehicles.class); + private static Logger logger = LoggerFactory.getLogger(InfiniteVehicles.class); private Map types = new HashMap(); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java index 4049e632..f63f9be3 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java @@ -17,8 +17,8 @@ package com.graphhopper.jsprit.core.problem.vehicle; import com.graphhopper.jsprit.core.util.RandomNumberGeneration; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -63,7 +63,7 @@ class VehicleFleetManagerImpl implements VehicleFleetManager { } - private static Logger logger = LogManager.getLogger(VehicleFleetManagerImpl.class); + private static Logger logger = LoggerFactory.getLogger(VehicleFleetManagerImpl.class); private Collection vehicles; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java index 45282ac5..a82b7a36 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java @@ -20,8 +20,8 @@ import com.graphhopper.jsprit.core.problem.AbstractVehicle; import com.graphhopper.jsprit.core.problem.Location; import com.graphhopper.jsprit.core.problem.Skills; import com.graphhopper.jsprit.core.problem.job.Break; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -107,7 +107,7 @@ public class VehicleImpl extends AbstractVehicle { */ public static class Builder { - static final Logger log = LogManager.getLogger(Builder.class.getName()); + static final Logger log = LoggerFactory.getLogger(Builder.class.getName()); private String id; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Resource.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Resource.java index a299dbec..e75cda76 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Resource.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Resource.java @@ -16,8 +16,11 @@ ******************************************************************************/ package com.graphhopper.jsprit.core.util; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; + + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileInputStream; @@ -32,7 +35,7 @@ import java.net.URL; */ public class Resource { - private static Logger log = LogManager.getLogger(Resource.class); + private static Logger log = LoggerFactory.getLogger(Resource.class); public final static URL getAsURL(final String filename) { URL url = Resource.class.getClassLoader().getResource(filename); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java index 905f45ba..afe32f5f 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java @@ -21,8 +21,8 @@ import com.graphhopper.jsprit.core.problem.cost.AbstractForwardVehicleRoutingTra import com.graphhopper.jsprit.core.problem.driver.Driver; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl.VehicleCostParams; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Map; @@ -99,7 +99,7 @@ public class VehicleRoutingTransportCostsMatrix extends AbstractForwardVehicleRo * @author schroeder */ public static class Builder { - private static Logger log = LogManager.getLogger(Builder.class); + private static Logger log = LoggerFactory.getLogger(Builder.class); private boolean isSymmetric; diff --git a/jsprit-core/src/main/resources/log4j2.xml b/jsprit-core/src/main/resources/log4j2.xml deleted file mode 100644 index cb4db72b..00000000 --- a/jsprit-core/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java index 4346860f..d4fd82e1 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/BuildPDVRPAlgoFromScratch_IT.java @@ -39,11 +39,11 @@ import com.graphhopper.jsprit.core.problem.vehicle.InfiniteFleetManagerFactory; import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import com.graphhopper.jsprit.core.util.Solutions; import junit.framework.Assert; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; @@ -54,7 +54,7 @@ public class BuildPDVRPAlgoFromScratch_IT { VehicleRoutingAlgorithm vra; - static Logger log = LogManager.getLogger(BuildPDVRPAlgoFromScratch_IT.class); + static Logger log = LoggerFactory.getLogger(BuildPDVRPAlgoFromScratch_IT.class); @Before public void setup() { diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index 349def75..c0f7f942 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -56,6 +56,18 @@ jsprit-analysis ${project.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + 2.0.1 + + + + org.apache.logging.log4j + log4j-core + 2.0.1 + diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java index 2895e0c0..f49e1c64 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java @@ -24,8 +24,8 @@ import com.graphhopper.jsprit.core.problem.job.Service; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import com.graphhopper.jsprit.core.util.Coordinate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -53,7 +53,7 @@ public class BelhaizaReader { this.variableCostProjectionFactor = costProjectionFactor; } - private static Logger logger = LogManager.getLogger(BelhaizaReader.class); + private static Logger logger = LoggerFactory.getLogger(BelhaizaReader.class); private final VehicleRoutingProblem.Builder vrpBuilder; @@ -135,7 +135,7 @@ public class BelhaizaReader { reader.close(); } catch (IOException e) { e.printStackTrace(); - logger.error(e); + logger.error(e.toString()); System.exit(1); } } @@ -145,7 +145,7 @@ public class BelhaizaReader { return reader.readLine(); } catch (IOException e) { e.printStackTrace(); - logger.error(e); + logger.error(e.toString()); System.exit(1); return null; } @@ -163,7 +163,7 @@ public class BelhaizaReader { reader = new BufferedReader(new FileReader(solomonFile)); } catch (FileNotFoundException e1) { e1.printStackTrace(); - logger.error(e1); + logger.error(e1.toString()); System.exit(1); } return reader; diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/ChristofidesReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/ChristofidesReader.java index d3cdd381..ebdc708b 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/ChristofidesReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/ChristofidesReader.java @@ -24,8 +24,8 @@ import com.graphhopper.jsprit.core.problem.job.Service; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import com.graphhopper.jsprit.core.util.Coordinate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -42,7 +42,7 @@ import java.io.IOException; */ public class ChristofidesReader { - private static Logger logger = LogManager.getLogger(ChristofidesReader.class); + private static Logger logger = LoggerFactory.getLogger(ChristofidesReader.class); private final VehicleRoutingProblem.Builder vrpBuilder; diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/CordeauReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/CordeauReader.java index fbc0d18a..a92b7ab0 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/CordeauReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/CordeauReader.java @@ -25,8 +25,8 @@ import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import com.graphhopper.jsprit.core.util.Coordinate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -48,7 +48,7 @@ import java.util.List; */ public class CordeauReader { - private static Logger logger = LogManager.getLogger(CordeauReader.class); + private static Logger logger = LoggerFactory.getLogger(CordeauReader.class); private final VehicleRoutingProblem.Builder vrpBuilder; diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LiLimReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LiLimReader.java index 0f73f791..1f3233ca 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LiLimReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LiLimReader.java @@ -25,8 +25,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import com.graphhopper.jsprit.core.util.Coordinate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -78,7 +78,7 @@ public class LiLimReader { } - private static Logger logger = LogManager.getLogger(LiLimReader.class); + private static Logger logger = LoggerFactory.getLogger(LiLimReader.class); private VehicleRoutingProblem.Builder vrpBuilder; diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LopezIbanezBlumReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LopezIbanezBlumReader.java index 77bf309b..59e7dd3f 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LopezIbanezBlumReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LopezIbanezBlumReader.java @@ -6,8 +6,8 @@ import com.graphhopper.jsprit.core.problem.job.Service; import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -19,7 +19,7 @@ import java.io.IOException; */ public class LopezIbanezBlumReader { - private static Logger logger = LogManager.getLogger(LopezIbanezBlumReader.class); + private static Logger logger = LoggerFactory.getLogger(LopezIbanezBlumReader.class); private VehicleRoutingProblem.Builder builder; diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java index e221d36a..ecac26dc 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java @@ -25,8 +25,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import com.graphhopper.jsprit.core.util.Coordinate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -36,7 +36,7 @@ import java.io.IOException; public class LuiShenReader { - private static Logger logger = LogManager.getLogger(LuiShenReader.class); + private static Logger logger = LoggerFactory.getLogger(LuiShenReader.class); private final VehicleRoutingProblem.Builder vrpBuilder; diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/SolomonReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/SolomonReader.java index b789e5bc..ed71c4f9 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/SolomonReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/SolomonReader.java @@ -25,8 +25,8 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import com.graphhopper.jsprit.core.util.Coordinate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -51,7 +51,7 @@ public class SolomonReader { this.variableCostProjectionFactor = costProjectionFactor; } - private static Logger logger = LogManager.getLogger(SolomonReader.class); + private static Logger logger = LoggerFactory.getLogger(SolomonReader.class); private final VehicleRoutingProblem.Builder vrpBuilder; diff --git a/pom.xml b/pom.xml index 663744be..e32a5622 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 4.10 1.9.5 1.3 - 2.0 + 1.7.21 false @@ -275,17 +275,13 @@ - org.apache.logging.log4j - log4j-api - ${logger.version} - - - org.apache.logging.log4j - log4j-core + org.slf4j + slf4j-api ${logger.version} +