Changeset 17711 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

Timestamp:

08/03/20 18:06:16 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (9 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -35 +34 @@
   [StorableType("9A6CCE89-A4B6-4FA3-A150-181FC315B713")]
   public abstract class VRPProblemInstance : ParameterizedNamedItem, IVRPProblemInstance, IStatefulItem {
-    IVRPEvaluator moveEvaluator;
-
-    private object locker = new object();
-
-    public IVRPEvaluator MoveEvaluator {
-      get {
-        lock (locker) {
-          if (evaluator == null)
-            return null;
-          else {
-            if (moveEvaluator == null) {
-              moveEvaluator = evaluator.Clone() as IVRPEvaluator;
-
-              foreach (IParameter parameter in moveEvaluator.Parameters) {
-                if (parameter is ILookupParameter
-                  && parameter != moveEvaluator.ProblemInstanceParameter
-                  && parameter != moveEvaluator.VRPToursParameter) {
-                  (parameter as ILookupParameter).ActualName =
-                    VRPMoveEvaluator.MovePrefix +
-                    (parameter as ILookupParameter).ActualName;
-                }
-              }
-            }
-
-            return moveEvaluator;
-          }
-        }
-      }
-    }
-
-    protected abstract IEnumerable<IOperator> GetOperators();
-    protected abstract IEnumerable<IOperator> GetAnalyzers();
-
-    public IEnumerable<IOperator> Operators {
-      get {
-        return GetOperators().Union(GetAnalyzers());
-      }
-    }
 
     protected ValueParameter<DoubleMatrix> CoordinatesParameter {
@@ -131 +92 @@
     }
 
+    public virtual IEnumerable<IOperator> FilterOperators(IEnumerable<IOperator> operators) {
+      return operators.Where(x => x is IVRPOperator);
+    }
+
     protected virtual double CalculateDistance(int start, int end) {
-      double distance = 0.0;
-
-      distance =
+      var distance =
           Math.Sqrt(
             Math.Pow(Coordinates[start, 0] - Coordinates[end, 0], 2) +
@@ -172 +135 @@
     //cache for performance improvement
     private DoubleMatrix distanceMatrix = null;
-    private IVRPEvaluator evaluator = null;
-
-    public IVRPEvaluator SolutionEvaluator {
-      get {
-        return evaluator;
-      }
-      set {
-        lock (locker) {
-          moveEvaluator = null;
-          evaluator = value;
-          EvalBestKnownSolution();
-        }
-      }
-    }
+    
 
     public virtual double GetDistance(int start, int end, IVRPEncodedSolution solution) {
@@ -208 +158 @@
     }
 
-    public bool Feasible(IVRPEncodedSolution solution) {
-      return evaluator.Feasible(
-        evaluator.Evaluate(
-          this, solution));
-    }
-
-    public bool TourFeasible(Tour tour, IVRPEncodedSolution solution) {
-      return evaluator.Feasible(
-        evaluator.EvaluateTour(
-        this, tour, solution));
+    protected virtual VRPEvaluation CreateTourEvaluation() {
+      return new VRPEvaluation();
     }
 
     public VRPEvaluation Evaluate(IVRPEncodedSolution solution) {
-      return evaluator.Evaluate(this, solution);
+      VRPEvaluation evaluation = CreateTourEvaluation();
+      evaluation.IsFeasible = true;
+      foreach (Tour tour in solution.GetTours()) {
+        EvaluateTour(evaluation, tour, solution);
+      }
+      return evaluation;
     }
 
     public VRPEvaluation EvaluateTour(Tour tour, IVRPEncodedSolution solution) {
-      return evaluator.EvaluateTour(this, tour, solution);
-    }
-
-    public bool Feasible(VRPEvaluation eval) {
-      return evaluator.Feasible(eval);
+      VRPEvaluation evaluation = CreateTourEvaluation();
+      evaluation.IsFeasible = true;
+      EvaluateTour(evaluation, tour, solution);
+      return evaluation;
     }
 
     public double GetInsertionCosts(VRPEvaluation eval, IVRPEncodedSolution solution, int customer, int tour, int index, out bool feasible) {
-      return evaluator.GetInsertionCosts(this, solution, eval, customer, tour, index, out feasible);
-    }
+      bool tourFeasible;
+      double costs = GetTourInsertionCosts(
+        solution,
+        eval.InsertionInfo.GetTourInsertionInfo(tour),
+        index,
+        customer, out tourFeasible);
+
+      feasible = tourFeasible;
+
+      return costs;
+    }
+    protected abstract double GetTourInsertionCosts(IVRPEncodedSolution solution, TourInsertionInfo tourInsertionInfo, int index, int customer, out bool feasible);
+
+    protected abstract void EvaluateTour(VRPEvaluation eval, Tour tour, IVRPEncodedSolution solution);
 
 
@@ -241 +199 @@
     protected void EvalBestKnownSolution() {
       EventHandler tmp = EvaluationChanged;
-      if (tmp != null)
-        tmp(this, null);
-    }
-
-    protected abstract IVRPEvaluator Evaluator { get; }
-    protected abstract IVRPCreator Creator { get; }
+      if (tmp != null) tmp(this, null);
+    }
 
     [StorableConstructor]
@@ -262 +216 @@
       Parameters.Add(new ValueParameter<DoubleValue>("EvalDistanceFactor", "The distance factor considered in the evaluation.", new DoubleValue(1)));
 
-      evaluator = Evaluator;
       AttachEventHandlers();
     }
@@ -268 +221 @@
     protected VRPProblemInstance(VRPProblemInstance original, Cloner cloner)
       : base(original, cloner) {
-      evaluator = Evaluator;
       AttachEventHandlers();
     }
@@ -274 +226 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      evaluator = Evaluator;
       AttachEventHandlers();
     }