Changeset 13372 for branches/ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

11/24/15 17:22:41 (9 years ago)

Author:

mkommend

Message:

#2521: Fixed all problems.

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Interfaces/ISymbolicExpressionTree.cs (modified) (1 diff)
• Interfaces/Operators/ISymbolicExpressionTreeCreator.cs (modified) (1 diff)
• SymbolicExpressionTreeEncoding.cs (modified) (2 diffs)
• SymbolicExpressionTreeProblem.cs (modified) (3 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTree.cs ¶

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
+
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
-  public interface ISymbolicExpressionTree : IItem {
+  public interface ISymbolicExpressionTree : IItem, ISolution {
     ISymbolicExpressionTreeNode Root { get; set; }
     int Length { get; }

branches/ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeCreator.cs ¶

@@ -27 +27 @@
   /// Interface for operators that create symbolic expression trees.
   /// </summary>
-  public interface ISymbolicExpressionTreeCreator : ISolutionCreator, ISymbolicExpressionTreeSizeConstraintOperator, ISymbolicExpressionTreeGrammarBasedOperator {
+  public interface ISymbolicExpressionTreeCreator : ISolutionCreator<ISymbolicExpressionTree>, ISymbolicExpressionTreeSizeConstraintOperator, ISymbolicExpressionTreeGrammarBasedOperator {
     ISymbolicExpressionTree CreateTree(IRandom random, ISymbolicExpressionGrammar grammar, int maxTreeLength, int maxTreeDepth);
   }

branches/ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs ¶

@@ -36 +36 @@
   [Item("SymbolicExpressionTreeEncoding", "Describes a symbolic expression tree encoding.")]
   [StorableClass]
-  public sealed class SymbolicExpressionTreeEncoding : Encoding<ISymbolicExpressionTreeCreator> {
+  public sealed class SymbolicExpressionTreeEncoding : Encoding<ISymbolicExpressionTree> {
     #region Encoding Parameters
     [Storable]
@@ -355 +355 @@
     #endregion
   }
-
-  public static class IndividualExtensionMethods {
-    public static ISymbolicExpressionTree SymbolicExpressionTree(this Individual individual) {
-      var encoding = individual.GetEncoding<SymbolicExpressionTreeEncoding>();
-      return individual.SymbolicExpressionTree(encoding.Name);
-    }
-
-    public static ISymbolicExpressionTree SymbolicExpressionTree(this Individual individual, string name) {
-      return (ISymbolicExpressionTree)individual[name];
-    }
-  }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs ¶

@@ -32 +32 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   [StorableClass]
-  public abstract class SymbolicExpressionTreeProblem : SingleObjectiveProblem<SymbolicExpressionTreeEncoding> {
+  public abstract class SymbolicExpressionTreeProblem : SingleObjectiveProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
 
     // persistence
@@ -48 +48 @@
     protected SymbolicExpressionTreeProblem() : base() { }
 
-    public virtual bool IsBetter(double quality, double bestQuality) {
-      return (Maximization && quality > bestQuality || !Maximization && quality < bestQuality);
-    }
-
-    public abstract double Evaluate(ISymbolicExpressionTree tree, IRandom random);
-    public sealed override double Evaluate(Individual individual, IRandom random) {
-      return Evaluate(individual.SymbolicExpressionTree(), random);
-    }
-
-    public virtual void Analyze(ISymbolicExpressionTree[] trees, double[] qualities, ResultCollection results,
+    public override void Analyze(ISymbolicExpressionTree[] trees, double[] qualities, ResultCollection results,
       IRandom random) {
       if (!results.ContainsKey("Best Solution Quality")) {
@@ -76 +67 @@
       }
     }
-
-    public sealed override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
-      Analyze(individuals.Select(ind => ind.SymbolicExpressionTree()).ToArray(), qualities, results, random);
-    }
   }
 }