Changeset 13339 for branches/ProblemRefactoring/HeuristicLab.Optimization

Timestamp:

11/23/15 16:14:57 (9 years ago)

Author:

mkommend

Message:

#2521: Rectored problems and encodings.

Location:

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3

Files:

• BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• BasicProblems/Interfaces/IProblemDefinition.cs (modified) (1 diff)
• BasicProblems/Interfaces/ISingleObjectiveProblem.cs (modified) (1 diff)
• BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs (modified) (1 diff)
• BasicProblems/MultiObjectiveProblem.cs (modified) (1 diff)
• BasicProblems/Problem.cs (modified) (3 diffs)
• BasicProblems/SingleObjectiveProblem.cs (modified) (2 diffs)
• Interfaces/IProblem.cs (modified) (1 diff)
• Problems/HeuristicOptimizationProblem.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Optimization {
-  public interface IMultiObjectiveProblemDefinition<TSolution> : IProblemDefinition
-  where TSolution : class, ISolution {
+  public interface IMultiObjectiveProblemDefinition<TEncoding, TSolution> : IProblemDefinition<TEncoding, TSolution>
+    where TEncoding : class, IEncoding<TSolution>
+    where TSolution : class, ISolution {
     bool[] Maximization { get; }
     double[] Evaluate(TSolution individual, IRandom random);

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblemDefinition.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Optimization {
-  public interface IProblemDefinition {
-    //IEncoding Encoding { get; }
+  public interface IProblemDefinition<TEncoding, TSolution>
+    where TEncoding : class, IEncoding<TSolution>
+    where TSolution : class, ISolution {
+    TEncoding Encoding { get; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblem.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
-  public interface ISingleObjectiveProblem<TSolution> : IProblem<TSolution>, ISingleObjectiveProblemDefinition<TSolution>, ISingleObjectiveHeuristicOptimizationProblem
+  public interface ISingleObjectiveProblem<TEncoding, TSolution> : IProblem<TEncoding, TSolution>, ISingleObjectiveProblemDefinition<TEncoding, TSolution>, ISingleObjectiveHeuristicOptimizationProblem
+    where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution {
     bool IsBetter(double quality, double bestQuality);

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
-  public interface ISingleObjectiveProblemDefinition<TSolution> : IProblemDefinition
-  where TSolution : class, ISolution {
+  public interface ISingleObjectiveProblemDefinition<TEncoding, TSolution> : IProblemDefinition<TEncoding, TSolution>
+    where TEncoding : class, IEncoding<TSolution>
+    where TSolution : class, ISolution {
     bool Maximization { get; }
     double Evaluate(TSolution individual, IRandom random);

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs

@@ -29 +29 @@
 namespace HeuristicLab.Optimization {
   [StorableClass]
-  public abstract class MultiObjectiveProblem<TSolution> : Problem<TSolution, MultiObjectiveEvaluator<TSolution>>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition<TSolution>
-  where TSolution : class, ISolution {
+  public abstract class MultiObjectiveProblem<TEncoding, TSolution> : Problem<TEncoding, TSolution, MultiObjectiveEvaluator<TSolution>>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition<TEncoding, TSolution>
+    where TEncoding : class, IEncoding<TSolution>
+    where TSolution : class, ISolution {
     [StorableConstructor]
     protected MultiObjectiveProblem(bool deserializing) : base(deserializing) { }
 
-    protected MultiObjectiveProblem(MultiObjectiveProblem<TSolution> original, Cloner cloner)
+    protected MultiObjectiveProblem(MultiObjectiveProblem<TEncoding, TSolution> original, Cloner cloner)
       : base(original, cloner) {
       ParameterizeOperators();

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -30 +30 @@
 namespace HeuristicLab.Optimization {
   [StorableClass]
-  public abstract class Problem<TSolution, TEvaluator> : HeuristicOptimizationProblem<TEvaluator, ISolutionCreator<TSolution>>, IProblemDefinition, IStorableContent
+  public abstract class Problem<TEncoding, TSolution, TEvaluator> : HeuristicOptimizationProblem<TEvaluator, ISolutionCreator<TSolution>>, IProblemDefinition<TEncoding, TSolution>, IStorableContent
+    where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution
     where TEvaluator : class, IEvaluator {
@@ -36 +37 @@
     public string Filename { get; set; }
 
-    protected IValueParameter<IEncoding<TSolution>> EncodingParameter {
-      get { return (IValueParameter<IEncoding<TSolution>>)Parameters["Encoding"]; }
+    protected IValueParameter<TEncoding> EncodingParameter {
+      get { return (IValueParameter<TEncoding>)Parameters["Encoding"]; }
     }
 
-    public IEncoding<TSolution> Encoding {
+    public TEncoding Encoding {
       get { return EncodingParameter.Value; }
       protected set {
@@ -61 +62 @@
     protected Problem()
       : base() {
-      Parameters.Add(new ValueParameter<IEncoding<TSolution>>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any."));
-      if (Encoding != null) Parameterize();
+      Parameters.Add(new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any."));
+      if (Encoding != null) {
+        SolutionCreator = Encoding.SolutionCreator;
+        Parameterize();
+      }
       RegisterEvents();
     }
 
-    protected Problem(Problem<TSolution, TEvaluator> original, Cloner cloner)
+    protected Problem(Problem<TEncoding, TSolution, TEvaluator> original, Cloner cloner)
       : base(original, cloner) {
       RegisterEvents();

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -30 +30 @@
 namespace HeuristicLab.Optimization {
   [StorableClass]
-  public abstract class SingleObjectiveProblem<TSolution> : Problem<TSolution, SingleObjectiveEvaluator<TSolution>>,
-    ISingleObjectiveProblemDefinition<TSolution>, ISingleObjectiveHeuristicOptimizationProblem
-  where TSolution : class, ISolution {
+  public abstract class SingleObjectiveProblem<TEncoding, TSolution> : Problem<TEncoding, TSolution, SingleObjectiveEvaluator<TSolution>>, ISingleObjectiveProblem<TEncoding, TSolution>
+    where TEncoding : class, IEncoding<TSolution>
+    where TSolution : class, ISolution {
 
     protected IValueParameter<DoubleValue> BestKnownQualityParameter {
@@ -52 +52 @@
     protected SingleObjectiveProblem(bool deserializing) : base(deserializing) { }
 
-    protected SingleObjectiveProblem(SingleObjectiveProblem<TSolution> original, Cloner cloner)
+    protected SingleObjectiveProblem(SingleObjectiveProblem<TEncoding, TSolution> original, Cloner cloner)
       : base(original, cloner) {
       ParameterizeOperators();

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs

@@ -36 +36 @@
   }
 
-  public interface IProblem<TSolution> : IHeuristicOptimizationProblem where TSolution : class, ISolution {
-    IEncoding<TSolution> Encoding { get; }
+  public interface IProblem<TEncoding, TSolution> : IHeuristicOptimizationProblem, IProblemDefinition<TEncoding, TSolution>
+    where TEncoding : class, IEncoding<TSolution>
+    where TSolution : class, ISolution {
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs

@@ -99 +99 @@
     }
 
-    protected virtual void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
+    private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
       OnSolutionCreatorChanged();
     }