From 22449235752f760074ad96fdfa09d3572d4505d5 Mon Sep 17 00:00:00 2001 From: oblonski Date: Thu, 5 Mar 2015 16:23:54 +0100 Subject: [PATCH] change to public visibility --- .../recreate/BestInsertionConcurrent.java | 2 +- .../core/algorithm/ruin/JobNeighborhoods.java | 4 +++- .../ruin/JobNeighborhoodsFactory.java | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java index e993eb79..90ec9084 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BestInsertionConcurrent.java @@ -40,7 +40,7 @@ import java.util.concurrent.*; * */ -final class BestInsertionConcurrent implements InsertionStrategy{ +public final class BestInsertionConcurrent implements InsertionStrategy{ static class Batch { List routes = new ArrayList(); diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoods.java b/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoods.java index 6021d9a1..1c31c61e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoods.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoods.java @@ -7,8 +7,10 @@ import java.util.Iterator; /** * Created by schroeder on 07/01/15. */ -interface JobNeighborhoods { +public interface JobNeighborhoods { public Iterator getNearestNeighborsIterator(int nNeighbors, Job neighborTo); + public void initialise(); + } diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java b/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java new file mode 100644 index 00000000..aa0cc4aa --- /dev/null +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/ruin/JobNeighborhoodsFactory.java @@ -0,0 +1,19 @@ +package jsprit.core.algorithm.ruin; + +import jsprit.core.algorithm.ruin.distance.JobDistance; +import jsprit.core.problem.VehicleRoutingProblem; + +/** + * Created by schroeder on 05/03/15. + */ +public class JobNeighborhoodsFactory { + + public JobNeighborhoods createNeighborhoods(VehicleRoutingProblem vrp, JobDistance jobDistance){ + return new JobNeighborhoodsImpl(vrp,jobDistance); + } + + public JobNeighborhoods createNeighborhoods(VehicleRoutingProblem vrp, JobDistance jobDistance, int capacity){ + return new JobNeighborhoodsImplWithCapRestriction(vrp,jobDistance,capacity); + } + +}