Changeset 17709 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators

Timestamp:

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

Author:

abeham

Message:

#2521: working on VRP

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators

Files:

• ScopeUtil.cs (modified) (1 diff)
• SingleObjectiveEvaluator.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/ScopeUtil.cs

@@ -86 +86 @@
         scope.Variables.Add(new Variable(EvaluationResultName, solutionContext.EvaluationResult));
       } else variable2.Value = solutionContext.EvaluationResult;
+      if (solutionContext.EvaluationResult != null) {
+        foreach (var item in solutionContext.EvaluationResult.AdditionalData) {
+          if (item.Value is IItem i) {
+            if (!scope.Variables.TryGetValue(item.Key, out var variable))
+              scope.Variables.Add(new Variable(item.Key, i));
+            else variable.Value = i;
+          }
+        }
+      }
     }
   }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

@@ -69 +69 @@
       ScopeUtil.CopyToScope(ExecutionContext.Scope, solutionContext);
       QualityParameter.ActualValue = new DoubleValue(solutionContext.EvaluationResult.Quality);
-
       return base.InstrumentedApply();
     }