Changeset 17710 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution

Timestamp:

08/03/20 15:50:59 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/BestVRPSolutionAnalyzer.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/BestVRPSolutionAnalyzer.cs

@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 
@@ -33 +34 @@
   /// An operator for analyzing the best solution of Vehicle Routing Problems.
   /// </summary>
+  //TODO: remove this operator -> part of VRP problem analyze
   [Item("BestVRPSolutionAnalyzer", "An operator for analyzing the best solution of Vehicle Routing Problems.")]
   [StorableType("3e1bb409-0b8f-4324-826c-2190aa5fb2b6")]
   public sealed class BestVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
+
+    [Storable] private ILookupParameter<IVRPProblemInstance> problemInstanceParameter;
+    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter => problemInstanceParameter;
+    [Storable] private IScopeTreeLookupParameter<IVRPEncodedSolution> vrpToursParameter;
+    public IScopeTreeLookupParameter<IVRPEncodedSolution> VRPToursParameter => vrpToursParameter;
 
     [Storable] private IScopeTreeLookupParameter<VRPEvaluation> evaluationParameter;
@@ -43 +50 @@
     public ILookupParameter<VRPSolution> BestSolutionParameter => bestSolutionParameter;
 
-    [Storable] private IResultParameter<VRPEvaluation> bestEvaluationParameter;
-    public IResultParameter<VRPEvaluation> BestSolutionEvaluationParameter => bestEvaluationParameter;
+    [Storable] private ILookupParameter<VRPSolution> bestFeasibleSolutionParameter;
+    public ILookupParameter<VRPSolution> BestFeasibleSolutionParameter => bestFeasibleSolutionParameter;
+
+    [Storable] private IResultParameter<VRPEvaluation> bestEvaluationResult;
+    public IResultParameter<VRPEvaluation> BestSolutionEvaluationResult => bestEvaluationResult;
+    [Storable] private IResultParameter<VRPEvaluation> bestFeasibleEvaluationResult;
+    public IResultParameter<VRPEvaluation> BestFeasibleSolutionEvaluationResult => bestFeasibleEvaluationResult;
+    [Storable] private IResultParameter<VRPSolution> bestSolutionResult;
+    public IResultParameter<VRPSolution> BestSolutionResult => bestSolutionResult;
+    [Storable] private IResultParameter<VRPSolution> bestFeasibleSolutionResult;
+    public IResultParameter<VRPSolution> BestFeasibleSolutionResult => bestFeasibleSolutionResult;
 
     public bool EnabledByDefault {
@@ -54 +70 @@
     private BestVRPSolutionAnalyzer(BestVRPSolutionAnalyzer original, Cloner cloner)
       : base(original, cloner) {
+      problemInstanceParameter = cloner.Clone(original.problemInstanceParameter);
+      vrpToursParameter = cloner.Clone(original.vrpToursParameter);
       evaluationParameter = cloner.Clone(original.evaluationParameter);
       bestSolutionParameter = cloner.Clone(original.bestSolutionParameter);
-      bestEvaluationParameter = cloner.Clone(original.bestEvaluationParameter);
+      bestFeasibleSolutionParameter = cloner.Clone(original.bestFeasibleSolutionParameter);
+      bestEvaluationResult = cloner.Clone(original.bestEvaluationResult);
+      bestFeasibleEvaluationResult = cloner.Clone(original.bestFeasibleEvaluationResult);
+      bestSolutionResult = cloner.Clone(original.bestSolutionResult);
+      bestFeasibleSolutionResult = cloner.Clone(original.bestFeasibleSolutionResult);
     }
     public BestVRPSolutionAnalyzer()
       : base() {
+      Parameters.Add(problemInstanceParameter = new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance."));
+      Parameters.Add(vrpToursParameter = new ScopeTreeLookupParameter<IVRPEncodedSolution>("VRPTours", "The VRP encoded solution."));
       Parameters.Add(evaluationParameter = new ScopeTreeLookupParameter<VRPEvaluation>("EvaluationResult", "The qualities of the VRP solutions which should be analyzed."));
       Parameters.Add(bestSolutionParameter = new LookupParameter<VRPSolution>("BestSolution", "The best-so-far solution."));
-      Parameters.Add(bestEvaluationParameter = new ResultParameter<VRPEvaluation>("Best VRP Evaluation", "The best VRP evaluation.", "Results"));
+      Parameters.Add(bestFeasibleSolutionParameter = new LookupParameter<VRPSolution>("BestFeasibleSolution", "The best-so-far feasible solution."));
+      Parameters.Add(bestEvaluationResult = new ResultParameter<VRPEvaluation>("Best VRP Solution Evaluation", "The best VRP evaluation.", "Results"));
+      Parameters.Add(bestFeasibleEvaluationResult = new ResultParameter<VRPEvaluation>("Best Feasible VRP Solution Evaluation", "The best feasible VRP evaluation.", "Results"));
+      Parameters.Add(bestSolutionResult = new ResultParameter<VRPSolution>("Best VRP Solution", "The best-so-far VRP solution."));
+      Parameters.Add(bestFeasibleSolutionResult = new ResultParameter<VRPSolution>("Best feasible VRP Solution", "The best-so-far feasible VRP solution."));
     }
 
@@ -72 +100 @@
       var evaluations = EvaluationParameter.ActualValue;
 
-      int i = evaluations.Select((x, index) => new { index, Eval = x }).OrderBy(x => x.Eval.Quality).First().index;
+      var bestInPop = evaluations.Select((x, index) => new { index, Eval = x }).OrderBy(x => x.Eval.Quality).First();
+      var bestFeasibleInPop = evaluations.Select((x, index) => new { index, Eval = x }).Where(x => x.Eval.IsFeasible).OrderBy(x => x.Eval.Quality).FirstOrDefault();
 
-      var bestEvaluation = BestSolutionEvaluationParameter.ActualValue;
+      var bestEvaluation = BestSolutionEvaluationResult.ActualValue;
       
       var bestSolution = BestSolutionParameter.ActualValue;
-      if (bestSolution == null || evaluations[i].Quality <= bestSolution.Quality.Value) {
-        BestSolutionEvaluationParameter.ActualValue = (VRPEvaluation)evaluations[i].Clone();
+      if (bestSolution == null || bestInPop.Eval.Quality < bestSolution.Evaluation.Quality) {
+        var best = new VRPSolution(ProblemInstanceParameter.ActualValue,
+          VRPToursParameter.ActualValue[bestInPop.index], (VRPEvaluation)bestInPop.Eval.Clone());
+        BestSolutionParameter.ActualValue = best;
+        BestSolutionResult.ActualValue = best;
+        BestSolutionEvaluationResult.ActualValue = (VRPEvaluation)bestInPop.Eval.Clone();
+      };
+
+      if (bestFeasibleInPop != null) {
+        var bestFeasibleSolution = BestFeasibleSolutionParameter.ActualValue;
+        if (bestFeasibleSolution == null || bestFeasibleInPop.Eval.Quality < bestFeasibleSolution.Evaluation.Quality) {
+          var bestFeasible = new VRPSolution(ProblemInstanceParameter.ActualValue,
+          VRPToursParameter.ActualValue[bestFeasibleInPop.index], (VRPEvaluation)bestFeasibleInPop.Eval.Clone());
+          BestFeasibleSolutionParameter.ActualValue = bestFeasible;
+          bestFeasibleSolutionResult.ActualValue = bestFeasible;
+          BestFeasibleSolutionEvaluationResult.ActualValue = (VRPEvaluation)bestFeasibleInPop.Eval.Clone();
+        }
       }