Changeset 13339 for branches

Timestamp:

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

Author:

mkommend

Message:

#2521: Rectored problems and encodings.

Location:

branches/ProblemRefactoring

Files:

• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblemDefinition.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Binary;
 
 namespace HeuristicLab.Algorithms.ParameterlessPopulationPyramid {
@@ -34 +34 @@
   // B. W. Goldman and W. F. Punch, "Parameter-less Population Pyramid," GECCO, pp. 785–792, 2014
   // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
-  internal sealed class EvaluationTracker : BinaryProblem {
-    private readonly BinaryProblem problem;
+  internal sealed class EvaluationTracker : SingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> {
+    private readonly ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> problem;
 
     private int maxEvaluations;
@@ -59 +59 @@
       private set;
     }
+
+    public new BinaryVectorEncoding Encoding {
+      get { return problem.Encoding; }
+    }
     #endregion
 
@@ -75 +79 @@
       return new EvaluationTracker(this, cloner);
     }
-    public EvaluationTracker(BinaryProblem problem, int maxEvaluations) {
+    public EvaluationTracker(ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> problem, int maxEvaluations) {
       this.problem = problem;
       this.maxEvaluations = maxEvaluations;
-      BestSolution = new BinaryVector(Length);
+      BestSolution = new BinaryVector(problem.Encoding.Length);
       BestQuality = double.NaN;
       Evaluations = 0;
@@ -99 +103 @@
     }
 
-    public override int Length {
-      get { return problem.Length; }
-      set { problem.Length = value; }
-    }
-
     public override bool Maximization {
       get {

branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj

@@ -148 +148 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.Binary\3.3\HeuristicLab.Problems.Binary-3.3.csproj">
-      <Project>{fc627be5-0f93-47d8-bd2e-530ea2b8aa5f}</Project>
-      <Name>HeuristicLab.Problems.Binary-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
       <Project>{f4539fb6-4708-40c9-be64-0a1390aea197}</Project>

branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

@@ -32 +32 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Binary;
 using HeuristicLab.Random;
 
@@ -50 +49 @@
 
     public override Type ProblemType {
-      get { return typeof(BinaryProblem); }
+      get { return typeof(ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector>); }
     }
-    public new BinaryProblem Problem {
-      get { return (BinaryProblem)base.Problem; }
+    public new ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> Problem {
+      get { return (ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector>)base.Problem; }
       set { base.Problem = value; }
     }
@@ -84 +83 @@
       Results.Add(new Result("Best quality", BestQuality));
       for (int iteration = 0; iteration < Iterations; iteration++) {
-        var solution = new BinaryVector(Problem.Length);
+        var solution = new BinaryVector(Problem.Encoding.Length);
         for (int i = 0; i < solution.Length; i++) {
           solution[i] = random.Next(2) == 1;
@@ -98 +97 @@
     }
     // In the GECCO paper, Section 2.1
-    public static double ImproveToLocalOptimum(BinaryProblem problem, BinaryVector solution, double fitness, IRandom rand) {
+    public static double ImproveToLocalOptimum(ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> problem, BinaryVector solution, double fitness, IRandom rand) {
       var tried = new HashSet<int>();
       do {

branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Problems.Binary;
+using HeuristicLab.Optimization;
 using HeuristicLab.Random;
 
@@ -33 +33 @@
   public static class LinkageCrossover {
     // In the GECCO paper, Figure 3
-    public static double ImproveUsingTree(LinkageTree tree, IList<BinaryVector> donors, BinaryVector solution, double fitness, BinaryProblem problem, IRandom rand) {
+    public static double ImproveUsingTree(LinkageTree tree, IList<BinaryVector> donors, BinaryVector solution, double fitness, ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> problem, IRandom rand) {
       var options = Enumerable.Range(0, donors.Count).ToArray();
       foreach (var cluster in tree.Clusters) {
@@ -48 +48 @@
     }
 
-    private static double Donate(BinaryVector solution, double fitness, BinaryVector source, IEnumerable<int> cluster, BinaryProblem problem, IRandom rand, out bool changed) {
+    private static double Donate(BinaryVector solution, double fitness, BinaryVector source, IEnumerable<int> cluster, ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> problem, IRandom rand, out bool changed) {
       // keep track of which bits flipped to make the donation
       List<int> flipped = new List<int>();

branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

@@ -32 +32 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Binary;
 using HeuristicLab.Random;
 
@@ -44 +43 @@
   public class ParameterlessPopulationPyramid : BasicAlgorithm {
     public override Type ProblemType {
-      get { return typeof(BinaryProblem); }
-    }
-    public new BinaryProblem Problem {
-      get { return (BinaryProblem)base.Problem; }
+      get { return typeof(ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector>); }
+    }
+    public new ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> Problem {
+      get { return (ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector>)base.Problem; }
       set { base.Problem = value; }
     }
@@ -183 +182 @@
       if (seen.Contains(solution)) return;
       if (level == pyramid.Count) {
-        pyramid.Add(new Population(tracker.Length, random));
+        pyramid.Add(new Population(tracker.Encoding.Length, random));
       }
       var copied = (BinaryVector)solution.Clone();
@@ -193 +192 @@
     private double iterate() {
       // Create a random solution
-      BinaryVector solution = new BinaryVector(tracker.Length);
+      BinaryVector solution = new BinaryVector(tracker.Encoding.Length);
       for (int i = 0; i < solution.Length; i++) {
         solution[i] = random.Next(2) == 1;
@@ -249 +248 @@
           fitness = iterate();
           cancellationToken.ThrowIfCancellationRequested();
-        } finally {
+        }
+        finally {
           ResultsEvaluations = tracker.Evaluations;
           ResultsBestSolution = new BinaryVector(tracker.BestSolution);

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();
     }

branches/ProblemRefactoring/HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs

@@ -34 +34 @@
 namespace HeuristicLab.Problems.Binary {
   [StorableClass]
-  public abstract class BinaryProblem : SingleObjectiveProblem<BinaryVector> {
+  public abstract class BinaryProblem : SingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> {
     public virtual int Length {
       get { return Encoding.Length; }
       set { Encoding.Length = value; }
-    }
-
-    public new BinaryVectorEncoding Encoding {
-      get { return (BinaryVectorEncoding)base.Encoding; }
-      set { base.Encoding = value; }
     }
 
@@ -65 +60 @@
       var lengthParameter = new FixedValueParameter<IntValue>("Length", "The length of the BinaryVector.", new IntValue(10));
       Parameters.Add(lengthParameter);
-      Encoding = new BinaryVectorEncoding();
       Encoding.LengthParameter = lengthParameter;
       RegisterEventHandlers();