Changeset 16751 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

Timestamp:

04/03/19 15:37:38 (5 years ago)

Author:

mkommend

Message:

#2521: Renamed Solution to EncodedSolution.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs (modified) (3 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
   [StorableType("D877082E-9E77-4CB1-ABDB-35F63878E116")]
-  public abstract class Problem<TEncoding, TSolution, TEvaluator> : Problem,
-    IHeuristicOptimizationProblem, IProblemDefinition<TEncoding, TSolution>, IStorableContent
-    where TEncoding : class, IEncoding<TSolution>
-    where TSolution : class, ISolution
+  public abstract class Problem<TEncoding, TEncodedSolution, TEvaluator> : Problem,
+    IHeuristicOptimizationProblem, IProblemDefinition<TEncoding, TEncodedSolution>, IStorableContent
+    where TEncoding : class, IEncoding<TEncodedSolution>
+    where TEncodedSolution : class, IEncodedSolution
     where TEvaluator : class, IEvaluator {
 
     public string Filename { get; set; } // TODO: Really okay here? should be in Problem (non-generic)
 
-    //TODO remove parametr for encoding?
+    //TODO remove parameter for encoding?
     protected IValueParameter<TEncoding> EncodingParameter {
       get { return (IValueParameter<TEncoding>)Parameters["Encoding"]; }
@@ -115 +115 @@
     }
 
-    protected Problem(Problem<TEncoding, TSolution, TEvaluator> original, Cloner cloner)
+    protected Problem(Problem<TEncoding, TEncodedSolution, TEvaluator> original, Cloner cloner)
       : base(original, cloner) {
       oldEncoding = cloner.Clone(original.oldEncoding);
@@ -152 +152 @@
       oldEncoding = Encoding;
 
-      foreach (var op in Operators.OfType<IEncodingOperator<TSolution>>())
+      foreach (var op in Operators.OfType<IEncodingOperator<TEncodedSolution>>())
         op.EncodingParameter.ActualName = EncodingParameter.Name;