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

Timestamp:

08/03/20 11:35:39 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP

Location:

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

Files:

• BestVRPSolutionAnalyzer.cs (modified) (4 diffs)
• Capacitated (deleted)
• PickupAndDelivery (deleted)
• TimeWindowed (deleted)

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

@@ -21 +21 @@
 
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
-using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
-using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting {
@@ -37 +34 @@
   /// </summary>
   [Item("BestVRPSolutionAnalyzer", "An operator for analyzing the best solution of Vehicle Routing Problems.")]
-  [StorableType("42DFB4D7-0DDA-424A-9DB3-1EDAB917A26B")]
-  public sealed class BestVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, IGeneralVRPOperator, ISingleObjectiveOperator {
-    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
-      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }
-    }
-    public ScopeTreeLookupParameter<IVRPEncodedSolution> VRPToursParameter {
-      get { return (ScopeTreeLookupParameter<IVRPEncodedSolution>)Parameters["VRPTours"]; }
-    }
+  [StorableType("3e1bb409-0b8f-4324-826c-2190aa5fb2b6")]
+  public sealed class BestVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
 
-    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
-    }
-    public ScopeTreeLookupParameter<DoubleValue> DistanceParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Distance"]; }
-    }
-    public ScopeTreeLookupParameter<DoubleValue> VehiclesUtilizedParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["VehiclesUtilized"]; }
-    }
+    [Storable] private IScopeTreeLookupParameter<VRPEvaluation> evaluationParameter;
+    public IScopeTreeLookupParameter<VRPEvaluation> EvaluationParameter => evaluationParameter;
 
-    public LookupParameter<VRPSolution> BestSolutionParameter {
-      get { return (LookupParameter<VRPSolution>)Parameters["BestSolution"]; }
-    }
-    public LookupParameter<VRPSolution> BestValidSolutionParameter {
-      get { return (LookupParameter<VRPSolution>)Parameters["BestValidSolution"]; }
-    }
-    public ValueLookupParameter<ResultCollection> ResultsParameter {
-      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
-    }
+    [Storable] private ILookupParameter<VRPSolution> bestSolutionParameter;
+    public ILookupParameter<VRPSolution> BestSolutionParameter => bestSolutionParameter;
 
-    public LookupParameter<DoubleValue> BestKnownQualityParameter {
-      get { return (LookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
-    }
-    public LookupParameter<VRPSolution> BestKnownSolutionParameter {
-      get { return (LookupParameter<VRPSolution>)Parameters["BestKnownSolution"]; }
-    }
+    [Storable] private IResultParameter<VRPEvaluation> bestEvaluationParameter;
+    public IResultParameter<VRPEvaluation> BestSolutionEvaluationParameter => bestEvaluationParameter;
 
     public bool EnabledByDefault {
@@ -79 +52 @@
     [StorableConstructor]
     private BestVRPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
-
+    private BestVRPSolutionAnalyzer(BestVRPSolutionAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
+      evaluationParameter = cloner.Clone(original.evaluationParameter);
+      bestSolutionParameter = cloner.Clone(original.bestSolutionParameter);
+      bestEvaluationParameter = cloner.Clone(original.bestEvaluationParameter);
+    }
     public BestVRPSolutionAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The problem instance."));
-      Parameters.Add(new ScopeTreeLookupParameter<IVRPEncodedSolution>("VRPTours", "The VRP tours which should be evaluated."));
-
-      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this VRP instance."));
-      Parameters.Add(new LookupParameter<VRPSolution>("BestKnownSolution", "The best known solution of this VRP instance."));
-
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the VRP solutions which should be analyzed."));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Distance", "The distances of the VRP solutions which should be analyzed."));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("VehiclesUtilized", "The utilized vehicles of the VRP solutions which should be analyzed."));
-
-      Parameters.Add(new LookupParameter<VRPSolution>("BestSolution", "The best VRP solution."));
-      Parameters.Add(new LookupParameter<VRPSolution>("BestValidSolution", "The best valid VRP solution."));
-      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best VRP solution should be stored."));
+      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"));
     }
 
@@ -101 +69 @@
     }
 
-    private BestVRPSolutionAnalyzer(BestVRPSolutionAnalyzer original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    public override IOperation Apply() {
+      var evaluations = EvaluationParameter.ActualValue;
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      #region Backwards Compatibility
-      if (!Parameters.ContainsKey("BestKnownQuality")) {
-        Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this VRP instance."));
-      }
-      if (!Parameters.ContainsKey("BestKnownSolution")) {
-        Parameters.Add(new LookupParameter<VRPSolution>("BestKnownSolution", "The best known solution of this VRP instance."));
-      }
-      #endregion
-    }
+      int i = evaluations.Select((x, index) => new { index, Eval = x }).OrderBy(x => x.Eval.Quality).First().index;
 
-    public override IOperation Apply() {
-      IVRPProblemInstance problemInstance = ProblemInstanceParameter.ActualValue;
-      ItemArray<IVRPEncodedSolution> solutions = VRPToursParameter.ActualValue;
-      ResultCollection results = ResultsParameter.ActualValue;
-
-      ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
-      ItemArray<DoubleValue> distances = DistanceParameter.ActualValue;
-      ItemArray<DoubleValue> vehiclesUtilizations = VehiclesUtilizedParameter.ActualValue;
-
-      int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
-      IVRPEncodedSolution best = solutions[i].Clone() as IVRPEncodedSolution;
-      VRPSolution solution = BestSolutionParameter.ActualValue;
-      if (solution == null) {
-        solution = new VRPSolution(problemInstance, best.Clone() as IVRPEncodedSolution, new DoubleValue(qualities[i].Value));
-        BestSolutionParameter.ActualValue = solution;
-        results.Add(new Result("Best VRP Solution", solution));
-
-        results.Add(new Result("Best VRP Solution Distance", new DoubleValue(distances[i].Value)));
-        results.Add(new Result("Best VRP Solution VehicleUtilization", new DoubleValue(vehiclesUtilizations[i].Value)));
-      } else {
-        VRPEvaluation eval = problemInstance.Evaluate(solution.Solution);
-        if (qualities[i].Value <= eval.Quality) {
-          solution.ProblemInstance = problemInstance;
-          solution.Solution = best.Clone() as IVRPEncodedSolution;
-          solution.Quality.Value = qualities[i].Value;
-          (results["Best VRP Solution Distance"].Value as DoubleValue).Value = distances[i].Value;
-          (results["Best VRP Solution VehicleUtilization"].Value as DoubleValue).Value = vehiclesUtilizations[i].Value;
-        }
-      }
-
-      var idx = qualities.Select((x, index) => new { index, x.Value }).Where(index => problemInstance.Feasible(solutions[index.index])).OrderBy(x => x.Value).FirstOrDefault();
-      if (idx != null) {
-        int j = idx.index;
-        IVRPEncodedSolution bestFeasible = solutions[j].Clone() as IVRPEncodedSolution;
-        VRPSolution validSolution = BestValidSolutionParameter.ActualValue;
-        if (validSolution == null) {
-          validSolution = new VRPSolution(problemInstance, best.Clone() as IVRPEncodedSolution, new DoubleValue(qualities[j].Value));
-          BestValidSolutionParameter.ActualValue = validSolution;
-          if (results.ContainsKey("Best valid VRP Solution"))
-            results["Best valid VRP Solution"].Value = validSolution;
-          else
-            results.Add(new Result("Best valid VRP Solution", validSolution));
-
-          results.Add(new Result("Best valid VRP Solution Distance", new DoubleValue(distances[j].Value)));
-          results.Add(new Result("Best valid VRP Solution VehicleUtilization", new DoubleValue(vehiclesUtilizations[j].Value)));
-        } else {
-          if (qualities[j].Value <= validSolution.Quality.Value) {
-            if (ProblemInstanceParameter.ActualValue.Feasible(best)) {
-              validSolution.ProblemInstance = problemInstance;
-              validSolution.Solution = best.Clone() as IVRPEncodedSolution;
-              validSolution.Quality.Value = qualities[j].Value;
-              (results["Best valid VRP Solution Distance"].Value as DoubleValue).Value = distances[j].Value;
-              (results["Best valid VRP Solution VehicleUtilization"].Value as DoubleValue).Value = vehiclesUtilizations[j].Value;
-            }
-          }
-        }
-
-        DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
-        if (bestKnownQuality == null || qualities[j].Value < bestKnownQuality.Value) {
-          BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[j].Value);
-          BestKnownSolutionParameter.ActualValue = (VRPSolution)validSolution.Clone();
-        }
+      var bestEvaluation = BestSolutionEvaluationParameter.ActualValue;
+      
+      var bestSolution = BestSolutionParameter.ActualValue;
+      if (bestSolution == null || evaluations[i].Quality <= bestSolution.Quality.Value) {
+        BestSolutionEvaluationParameter.ActualValue = (VRPEvaluation)evaluations[i].Clone();
       }