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

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/Interfaces

Files:

• ISingleObjectiveProblemDefinition.cs (modified) (1 diff)
• ISolutionContext.cs (modified) (2 diffs)
• internal/INeighborBasedOperator.cs (modified) (1 diff)
• internal/ISingleObjectiveAnalysisOperator.cs (modified) (2 diffs)
• internal/ISingleObjectiveEvaluationOperator.cs (modified) (2 diffs)
• internal/ISolutionScope.cs (added)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs

@@ -39 +39 @@
     double Evaluate(TEncodedSolution solution, IRandom random);
     double Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
+    void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random);
+    void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random, CancellationToken cancellationToken);
 
     void Analyze(TEncodedSolution[] solutions, double[] qualities, ResultCollection results, IRandom random);
+    void Analyze(ISingleObjectiveSolutionContext<TEncodedSolution>[] solutionContexts, ResultCollection results, IRandom random);
+
     IEnumerable<TEncodedSolution> GetNeighbors(TEncodedSolution solution, IRandom random);
+    IEnumerable<ISingleObjectiveSolutionContext<TEncodedSolution>> GetNeighbors(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random);
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISolutionContext.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
+  //TODO discuss renaming to solution scope?
   [StorableType("383A35EB-03C9-473D-A20B-EE34E00BC174")]
   public interface ISolutionContext : IItem {
@@ -36 +37 @@
   }
 
-  public interface ISingleObjectiveSolutionContext : ISolutionContext {
-    //TODO discuss with abeham hiding of base property
-    new ISingleObjectiveEvaluationResult EvaluationResult { get; }
+  public interface ISolutionContext<TEncodedSolution> : ISolutionContext
+    where TEncodedSolution : class, IEncodedSolution {
+    new TEncodedSolution EncodedSolution { get; }
   }
 
-  public interface IMultiObjectiveSolutionContext : ISolutionContext {
-    new IMultiObjectiveEvaluationResult EvaluationResult { get; }
+
+  public interface ISingleObjectiveSolutionContext<TEncodedSolution> : ISolutionContext<TEncodedSolution>
+    where TEncodedSolution : class, IEncodedSolution {
+    //TODO discuss with abeham hiding of base property
+    new ISingleObjectiveEvaluationResult EvaluationResult { get; set; }
+  }
+
+  public interface IMultiObjectiveSolutionContext<TEncodedSolution> : ISolutionContext<TEncodedSolution>
+    where TEncodedSolution : class, IEncodedSolution {
+    new IMultiObjectiveEvaluationResult EvaluationResult { get; set; }
   }
 

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/INeighborBasedOperator.cs

@@ -29 +29 @@
   internal interface INeighborBasedOperator<TEncodedSolution> : IEncodingOperator<TEncodedSolution>
   where TEncodedSolution : class, IEncodedSolution {
-    Func<TEncodedSolution, IRandom, IEnumerable<TEncodedSolution>> GetNeighborsFunc { get; set; }
+    Func<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, IEnumerable<ISingleObjectiveSolutionContext<TEncodedSolution>>> GetNeighbors { get; set; }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveAnalysisOperator.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -28 +28 @@
   internal interface ISingleObjectiveAnalysisOperator<TEncodedSolution> : IEncodingOperator<TEncodedSolution>, ISingleObjectiveOperator
   where TEncodedSolution : class, IEncodedSolution {
-    Action<TEncodedSolution[], double[], ResultCollection, IRandom> AnalyzeAction { get; set; }
+    Action<ISingleObjectiveSolutionContext<TEncodedSolution>[], ResultCollection, IRandom> Analyze { get; set; }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -28 +28 @@
   internal interface ISingleObjectiveEvaluationOperator<TEncodedSolution> : ISingleObjectiveEvaluator, IEncodingOperator<TEncodedSolution>
   where TEncodedSolution : class, IEncodedSolution {
-    Func<TEncodedSolution, IRandom, double> EvaluateFunc { get; set; }
+    Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
   }
 }