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

Timestamp:

11/21/19 17:58:32 (5 years ago)

Author:

mkommend

Message:

#2521: First version of contexts in problem evaluation.

Location:

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

Files:

• SingleObjectiveAnalyzer.cs (modified) (2 diffs)
• SingleObjectiveEvaluator.cs (modified) (2 diffs)
• SingleObjectiveImprover.cs (modified) (3 diffs)
• SingleObjectiveMoveEvaluator.cs (modified) (2 diffs)
• SingleObjectiveMoveGenerator.cs (modified) (2 diffs)
• SolutionContextScope.cs (added)

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

@@ -53 +53 @@
     }
 
-    public Action<TEncodedSolution[], double[], ResultCollection, IRandom> AnalyzeAction { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>[], ResultCollection, IRandom> Analyze { get; set; }
 
     [StorableConstructor]
@@ -78 +78 @@
         scopes = scopes.Select(x => (IEnumerable<IScope>)x.SubScopes).Aggregate((a, b) => a.Concat(b));
 
-      var individuals = scopes.Select(s => ScopeUtil.GetEncodedSolution(s, encoding)).ToArray();
-      AnalyzeAction(individuals, QualityParameter.ActualValue.Select(x => x.Value).ToArray(), results, random);
+      var solutionContexts = scopes.Select(scope => {
+        var solution = ScopeUtil.GetEncodedSolution(scope, encoding);
+        var quality = ((DoubleValue)scope.Variables[QualityParameter.ActualName].Value).Value;
+        var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(scope, solution);
+        solutionContext.EvaluationResult = new SingleObjectiveEvaluationResult(quality);
+        return solutionContext;
+      }).ToArray();
+
+      Analyze(solutionContexts, results, random);
       return base.Apply();
     }

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

@@ -46 +46 @@
     }
 
-    public Func<TEncodedSolution, IRandom, double> EvaluateFunc { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
 
     [StorableConstructor]
@@ -63 +63 @@
       var encoding = EncodingParameter.ActualValue;
       var solution = ScopeUtil.GetEncodedSolution(ExecutionContext.Scope, encoding);
-      QualityParameter.ActualValue = new DoubleValue(EvaluateFunc(solution, random));
+      var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(ExecutionContext.Scope, solution);
+
+      Evaluate(solutionContext, random);
+      var qualityValue = solutionContext.EvaluationResult.Quality;
+
+      QualityParameter.ActualValue = new DoubleValue(qualityValue);
       return base.InstrumentedApply();
     }

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

@@ -63 +63 @@
     }
 
-    public Func<TEncodedSolution, IRandom, double> EvaluateFunc { get; set; }
-    public Func<TEncodedSolution, IRandom, IEnumerable<TEncodedSolution>> GetNeighborsFunc { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
+    public Func<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, IEnumerable<ISingleObjectiveSolutionContext<TEncodedSolution>>> GetNeighbors { get; set; }
 
     [StorableConstructor]
@@ -90 +90 @@
       var sampleSize = SampleSizeParameter.ActualValue.Value;
       var solution = ScopeUtil.GetEncodedSolution(ExecutionContext.Scope, encoding);
-      var quality = QualityParameter.ActualValue == null ? EvaluateFunc(solution, random) : QualityParameter.ActualValue.Value;
+      var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(ExecutionContext.Scope, solution);
+
+      double quality;
+      if (QualityParameter.ActualValue == null) {
+        if (!solutionContext.IsEvaluated) Evaluate(solutionContext, random);
+
+        quality = solutionContext.EvaluationResult.Quality;
+      } else quality = QualityParameter.ActualValue.Value;
 
       var count = 0;
@@ -96 +103 @@
         TEncodedSolution best = default(TEncodedSolution);
         var bestQuality = quality;
-        foreach (var neighbor in GetNeighborsFunc(solution, random).Take(sampleSize)) {
-          var q = EvaluateFunc(neighbor, random);
+        foreach (var neighbor in GetNeighbors(solutionContext, random).Take(sampleSize)) {
+          Evaluate(neighbor, random);
+          var q = neighbor.EvaluationResult.Quality;
           count++;
           if (maximize && bestQuality > q || !maximize && bestQuality < q) continue;
-          best = neighbor;
+          best = neighbor.EncodedSolution;
           bestQuality = q;
         }

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

@@ -50 +50 @@
     }
 
-    public Func<TEncodedSolution, IRandom, double> EvaluateFunc { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
 
     [StorableConstructor]
@@ -69 +69 @@
       var random = RandomParameter.ActualValue;
       var encoding = EncodingParameter.ActualValue;
-      var individual = ScopeUtil.GetEncodedSolution(ExecutionContext.Scope, encoding);
-      MoveQualityParameter.ActualValue = new DoubleValue(EvaluateFunc(individual, random));
+      var solution = ScopeUtil.GetEncodedSolution(ExecutionContext.Scope, encoding);
+      var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(ExecutionContext.Scope, solution);
+
+      Evaluate(solutionContext, random);
+      var qualityValue = solutionContext.EvaluationResult.Quality;
+
+      MoveQualityParameter.ActualValue = new DoubleValue(qualityValue);
       return base.Apply();
     }

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

@@ -48 +48 @@
     }
 
-    public Func<TEncodedSolution, IRandom, IEnumerable<TEncodedSolution>> GetNeighborsFunc { get; set; }
+    public Func<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, IEnumerable<ISingleObjectiveSolutionContext<TEncodedSolution>>> GetNeighbors { get; set; }
 
     [StorableConstructor]
@@ -69 +69 @@
       var encoding = EncodingParameter.ActualValue;
       var solution = ScopeUtil.GetEncodedSolution(ExecutionContext.Scope, encoding);
-      var nbhood = GetNeighborsFunc(solution, random).Take(sampleSize).ToList();
+      var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(ExecutionContext.Scope, solution);
 
+      var nbhood = GetNeighbors(solutionContext, random).Take(sampleSize).ToList();
       var moveScopes = new Scope[nbhood.Count];
       for (int i = 0; i < moveScopes.Length; i++) {
         moveScopes[i] = new Scope(i.ToString(CultureInfo.InvariantCulture.NumberFormat));
-        ScopeUtil.CopyEncodedSolutionToScope(moveScopes[i], encoding, nbhood[i]);
+        ScopeUtil.CopyEncodedSolutionToScope(moveScopes[i], encoding, nbhood[i].EncodedSolution);
       }
       ExecutionContext.Scope.SubScopes.AddRange(moveScopes);