Changeset 17710 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs

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/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs (modified) (7 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Problems.VehicleRouting.Variants;
 
@@ -43 +44 @@
       get { return (ScopeTreeLookupParameter<IVRPEncodedSolution>)Parameters["VRPTours"]; }
     }
-    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
-    }
-
-    public ScopeTreeLookupParameter<DoubleValue> OverloadParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Overload"]; }
+    public ScopeTreeLookupParameter<CVRPEvaluation> EvaluationParameter {
+      get { return (ScopeTreeLookupParameter<CVRPEvaluation>)Parameters["EvaluationResult"]; }
     }
 
@@ -79 +76 @@
       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 ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the VRP solutions which should be analyzed."));
-
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Overload", "The overloads of the VRP solutions which should be analyzed."));
+      Parameters.Add(new ScopeTreeLookupParameter<CVRPEvaluation>("EvaluationResult", "The evaluations of the VRP solutions which should be analyzed."));
 
       Parameters.Add(new ValueParameter<DoubleValue>("Sigma", "The sigma applied to the penalty factor.", new DoubleValue(0.5)));
@@ -113 +108 @@
       ResultCollection results = ResultsParameter.ActualValue;
 
-      ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
-      ItemArray<DoubleValue> overloads = OverloadParameter.ActualValue;
+      ItemArray<CVRPEvaluation> evaluations = EvaluationParameter.ActualValue;
 
       double sigma = SigmaParameter.Value.Value;
@@ -121 +115 @@
       double maxPenalty = MaxPenaltyFactorParameter.Value.Value;
 
-      for (int j = 0; j < qualities.Length; j++) {
-        qualities[j].Value -= overloads[j].Value * cvrp.OverloadPenalty.Value;
+      for (int j = 0; j < evaluations.Length; j++) {
+        evaluations[j].Quality -= evaluations[j].Overload * cvrp.OverloadPenalty.Value;
       }
 
       int validCount = 0;
-      for (int j = 0; j < qualities.Length; j++) {
-        if (overloads[j].Value == 0)
+      for (int j = 0; j < evaluations.Length; j++) {
+        if (evaluations[j].Overload == 0)
           validCount++;
       }
 
-      double factor = 1.0 - ((double)validCount / (double)qualities.Length);
+      double factor = 1.0 - ((double)validCount / (double)evaluations.Length);
 
       double min = cvrp.OverloadPenalty.Value / (1 + sigma);
@@ -142 +136 @@
         cvrp.CurrentOverloadPenalty.Value = maxPenalty;
 
-      for (int j = 0; j < qualities.Length; j++) {
-        qualities[j].Value += overloads[j].Value * cvrp.CurrentOverloadPenalty.Value;
+      for (int j = 0; j < evaluations.Length; j++) {
+        evaluations[j].Quality += evaluations[j].Overload * cvrp.CurrentOverloadPenalty.Value;
       }
 
-      if (!results.ContainsKey("Current Overload Penalty")) {
-        results.Add(new Result("Current Overload Penalty", new DoubleValue(cvrp.CurrentOverloadPenalty.Value)));
+      if (!results.TryGetValue("Current Overload Penalty", out IResult res) || !(res.Value is DoubleValue)) {
+        results.AddOrUpdateResult("Current Overload Penalty", new DoubleValue(cvrp.CurrentOverloadPenalty.Value));
       } else {
-        (results["Current Overload Penalty"].Value as DoubleValue).Value = cvrp.CurrentOverloadPenalty.Value;
+        (res.Value as DoubleValue).Value = cvrp.CurrentOverloadPenalty.Value;
       }