Changeset 17712 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

Timestamp:

08/04/20 07:06:39 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -25 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -43 +44 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["MovePenalty"]; }
     }
+    public ILookupParameter<VRPEvaluation> MoveEvaluationResultParameter {
+      get { return (ILookupParameter<VRPEvaluation>)Parameters["MoveEvaluationResult"]; }
+    }
 
     [StorableConstructor]
@@ -52 +56 @@
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<DoubleValue>("MovePenalty", "The penalty applied to the move."));
+      Parameters.Add(new LookupParameter<VRPEvaluation>("MoveEvaluationResult", "The evaluation result of the move."));
     }
 
@@ -60 +65 @@
     //helper method to evaluate an updated individual
     protected void UpdateEvaluation(IVRPEncodedSolution updatedTours) {
-      IVRPEvaluator evaluator = ProblemInstance.MoveEvaluator;
-
-      try {
-        this.ExecutionContext.Scope.Variables.Add(new Variable(evaluator.VRPToursParameter.ActualName,
-          updatedTours));
-
-        IAtomicOperation op = this.ExecutionContext.CreateChildOperation(evaluator);
-        op.Operator.Execute((IExecutionContext)op, CancellationToken);
-      }
-      finally {
-        this.ExecutionContext.Scope.Variables.Remove(evaluator.VRPToursParameter.ActualName);
-      }
+      var evaluation = ProblemInstance.Evaluate(updatedTours);
+      MoveEvaluationResultParameter.ActualValue = evaluation;
+      MoveQualityParameter.ActualValue = new DoubleValue(evaluation.Quality);
+      MovePenaltyParameter.ActualValue = new DoubleValue(evaluation.Penalty);
     }