Changeset 17381 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SolutionContextScope.cs

Timestamp:

12/18/19 15:06:18 (4 years ago)

Author:

mkommend

Message:

#2521: Fixed single-objective evaluation results and scope contexts.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SolutionContextScope.cs (modified) (4 diffs)

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

@@ -27 +27 @@
 //TODO: don't derive from NamedItem, this has been done to have a fast working prototype
 namespace HeuristicLab.Optimization {
-  internal class SolutionContextScope<TEncodedSolution> : SolutionContext<TEncodedSolution>, ISolutionScope
+  internal abstract class SolutionContextScope<TEncodedSolution> : SolutionContext<TEncodedSolution>, ISolutionScope
    where TEncodedSolution : class, IEncodedSolution {
-    private readonly IScope scope;
+    protected static string EVALUATION_RESULT_VARIABLE_NAME = "Evaluation Result";
+
+    protected IScope Scope { get; }
 
     public SolutionContextScope(IScope scope, TEncodedSolution solution) : base(solution) {
-      this.scope = scope;
+      Scope = scope;
     }
 
@@ -40 +42 @@
 
     IScope IScope.Parent {
-      get { return scope.Parent; }
+      get { return Scope.Parent; }
       set { throw new NotSupportedException(); }
     }
 
-    VariableCollection IScope.Variables => scope.Variables;
-    ScopeList IScope.SubScopes => scope.SubScopes;
+    VariableCollection IScope.Variables => Scope.Variables;
+    ScopeList IScope.SubScopes => Scope.SubScopes;
 
     void IScope.Clear() { throw new NotImplementedException(); }
 
-
-
     #region INamedItem members
-    string INamedItem.Name { get { return scope.Name; } set => throw new NotImplementedException(); }
+    string INamedItem.Name { get { return Scope.Name; } set => throw new NotImplementedException(); }
     bool INamedItem.CanChangeName => false;
 
-    string INamedItem.Description { get { return scope.Description; } set => throw new NotImplementedException(); }
+    string INamedItem.Description { get { return Scope.Description; } set => throw new NotImplementedException(); }
     bool INamedItem.CanChangeDescription => false;
 
@@ -78 +78 @@
     where TEncodedSolution : class, IEncodedSolution {
 
-    public new ISingleObjectiveEvaluationResult EvaluationResult { get; set; }
+    public new ISingleObjectiveEvaluationResult EvaluationResult {
+      get {
+        return (ISingleObjectiveEvaluationResult)Scope.Variables[EVALUATION_RESULT_VARIABLE_NAME].Value;
+      }
+      set {
+        Scope.Variables.Remove(EVALUATION_RESULT_VARIABLE_NAME);
+        Scope.Variables.Add(new Variable(EVALUATION_RESULT_VARIABLE_NAME, value));
+      }
+    }
+
     public SingleObjectiveSolutionContextScope(IScope scope, TEncodedSolution solution) : base(scope, solution) {
     }
@@ -86 +95 @@
   where TEncodedSolution : class, IEncodedSolution {
 
-    public new IMultiObjectiveEvaluationResult EvaluationResult { get; set; }
+    public new IMultiObjectiveEvaluationResult EvaluationResult {
+      get {
+        return (IMultiObjectiveEvaluationResult)Scope.Variables[EVALUATION_RESULT_VARIABLE_NAME].Value;
+      }
+      set {
+        Scope.Variables.Remove(EVALUATION_RESULT_VARIABLE_NAME);
+        Scope.Variables.Add(new Variable(EVALUATION_RESULT_VARIABLE_NAME, value));
+      }
+    }
     public MultiObjectiveSolutionContextScope(IScope scope, TEncodedSolution solution) : base(scope, solution) {
     }