Changeset 17612 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems

Timestamp:

06/19/20 16:38:33 (5 years ago)

Author:

mkommend

Message:

#2521: Added first version of problem results.

Location:

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

Files:

• Interfaces/IProblem.cs (modified) (2 diffs)
• Interfaces/IProblemDefinition.cs (modified) (1 diff)
• Problem.cs (modified) (2 diffs)
• SingleObjectiveProblem.cs (modified) (1 diff)

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

@@ -32 +32 @@
   /// </summary>
   public interface IProblem : IParameterizedNamedItem, IStorableContent {
+    //TODO extract into interface? ResultsProducingItems? Problem and Algorithm 
+    ResultCollection Results { get; }
 
     event EventHandler Reset;
@@ -48 +50 @@
   public interface IProblem<TEncoding, TEncodedSolution> : IHeuristicOptimizationProblem
     where TEncoding : class, IEncoding<TEncodedSolution>
-    where TEncodedSolution : class, IEncodedSolution { }
+    where TEncodedSolution : class, IEncodedSolution {
+  }
 }

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

@@ -34 +34 @@
     where TEncodedSolution : class, IEncodedSolution {
     TEncoding Encoding { get; }
-
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -52 +52 @@
     }
 
+
     ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
       get { return Encoding.SolutionCreator; }
@@ -67 +68 @@
     }
 
-    //TODO is a parameter for the evaluator really necessary, only single-objective or multi-objective evulators calling the func are possible
+    //TODO is a parameter for the evaluator really necessary, only single-objective or multi-objective evaluators calling the func are possible
     public ValueParameter<TEvaluator> EvaluatorParameter {
       get { return (ValueParameter<TEvaluator>)Parameters["Evaluator"]; }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -130 +130 @@
     public virtual bool IsBetter(double quality, double bestQuality) {
       return IsBetter(Maximization, quality, bestQuality);
+    }
+
+    public virtual bool IsBetter(ISingleObjectiveSolutionContext<TEncodedSolution> solution, ISingleObjectiveSolutionContext<TEncodedSolution> otherSolution) {
+      return IsBetter(Maximization, solution.EvaluationResult.Quality, otherSolution.EvaluationResult.Quality);
     }