Context Navigation

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

Timestamp:

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

Author:

abeham

Message:

#2521: working on VRP

Location:

Files:

r17381	r17709
35	35	[Storable]
36	36	private readonly Dictionary<string, object> data = new Dictionary<string, object>();
	37	public IEnumerable<KeyValuePair<string, object>> AdditionalData => data.AsEnumerable();
37	38
38	39	protected EvaluationResult() : base() { }

-                      r17459
+                      r17709
 #endregion
+using System.Collections.Generic;
 using HEAL.Attic;
 using HeuristicLab.Core;
 …
     //TODO: make methods generic for get/set additional data
+    IEnumerable<KeyValuePair<string, object>> AdditionalData { get; }
     void SetAdditionalData(string identifier, object o);
     object GetAdditionalData(string identifier);

-                      r17699
+                      r17709
         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;
+          }
+        }
+      }
+    }
+  }

r17699	r17709
69	69	ScopeUtil.CopyToScope(ExecutionContext.Scope, solutionContext);
70	70	QualityParameter.ActualValue = new DoubleValue(solutionContext.EvaluationResult.Quality);
71
72	71	return base.InstrumentedApply();
73	72	}

Note: See TracChangeset for help on using the changeset viewer.