Changeset 3219 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree

Timestamp:

03/25/10 19:19:37 (15 years ago)

Author:

gkronber

Message:

Worked on SymbolicTreeEncoding plugin. #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3

Files:

• . (modified) (1 prop)
• Creators/ProbabilisticTreeCreator.cs (modified) (1 diff)
• Creators/RampedTreeCreator.cs (modified) (1 diff)
• Crossovers/GPCrossoverBase.cs (modified) (1 diff)
• Crossovers/LangdonHomologousCrossOver.cs (modified) (1 diff)
• Crossovers/OnePointCrossOver.cs (modified) (1 diff)
• Crossovers/SizeConstrictedGPCrossoverBase.cs (modified) (1 diff)
• Crossovers/SizeFairCrossOver.cs (modified) (1 diff)
• Crossovers/StandardCrossOver.cs (modified) (1 diff)
• Crossovers/UniformCrossover.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTree-3.3.csproj (added)
• HeuristicLab.snk (added)
• HeuristicLabEncodingsSymbolicExpressionTreePlugin.cs (added)
• HeuristicLabEncodingsSymbolicExpressionTreePlugin.cs.frame (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/HeuristicLabEncodingsSymbolicExpressionTree.cs.frame) (2 diffs)
• Interfaces/IFunction.cs (modified) (1 diff)
• Interfaces/IFunctionTree.cs (modified) (1 diff)
• Manipulators/ChangeNodeTypeManipulation.cs (modified) (1 diff)
• Manipulators/CutOutNodeManipulation.cs (modified) (1 diff)
• Manipulators/DeleteSubTreeManipulation.cs (modified) (1 diff)
• Manipulators/FullTreeShaker.cs (modified) (1 diff)
• Manipulators/GPManipulatorBase.cs (modified) (1 diff)
• Manipulators/OnePointShaker.cs (modified) (1 diff)
• Manipulators/SubstituteSubTreeManipulation.cs (modified) (1 diff)
• Properties (added)
• Properties/AssemblyInfo.frame (added)
• Symbol.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Function.cs) (4 diffs)
• SymbolicExpressionTree.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/FunctionTree.cs) (6 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Creators/ProbabilisticTreeCreator.cs

@@ -23 +23 @@
 using HeuristicLab.Data;
 using HeuristicLab.Random;
-using HeuristicLab.GP.Interfaces;
 using System;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class ProbabilisticTreeCreator : OperatorBase {
     private static int MAX_TRIES { get { return 100; } }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Creators/RampedTreeCreator.cs

@@ -25 +25 @@
 using HeuristicLab.Random;
 using System.Diagnostics;
-using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class RampedTreeCreator : OperatorBase {
     public override string Description {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Crossovers/GPCrossoverBase.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using System.Diagnostics;
-using HeuristicLab.Evolutionary;
-using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public abstract class GPCrossoverBase : CrossoverBase {
     public GPCrossoverBase()

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Crossovers/LangdonHomologousCrossOver.cs

@@ -25 +25 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   /// <summary>
   /// Implementation of a homologous crossover operator as described in: 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Crossovers/OnePointCrossOver.cs

@@ -24 +24 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   /// <summary>
   /// Implementation of a homologous one point crossover operator as described in: 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Crossovers/SizeConstrictedGPCrossoverBase.cs

@@ -24 +24 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public abstract class SizeConstrictedGPCrossoverBase : GPCrossoverBase {
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Crossovers/SizeFairCrossOver.cs

@@ -26 +26 @@
 using HeuristicLab.Random;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   /// <summary>
   /// Implementation of a size fair crossover operator as described in: 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Crossovers/StandardCrossOver.cs

@@ -24 +24 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class StandardCrossOver : SizeConstrictedGPCrossoverBase {
     private int MaxRecombinationTries { get { return 20; } }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Crossovers/UniformCrossover.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
-using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   /// <summary>
   /// Implementation of a homologous uniform crossover operator as described in: 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/HeuristicLabEncodingsSymbolicExpressionTreePlugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.GP.Operators {
-  [Plugin("HeuristicLab.GP.Operators", "3.3.0.$WCREV$")]
-  [PluginFile("HeuristicLab.GP.Operators-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Core-3.2")]
-  [PluginDependency("HeuristicLab.Data-3.2")]
-  [PluginDependency("HeuristicLab.Evolutionary-3.2")]
-  [PluginDependency("HeuristicLab.GP", "3.3")]
-  [PluginDependency("HeuristicLab.GP.Interfaces", "3.3")]
-  [PluginDependency("HeuristicLab.Operators-3.2")]
-  [PluginDependency("HeuristicLab.Random-3.2")]
-  [PluginDependency("HeuristicLab.Selection-3.2")]
-  public class HeuristicLabGPOperatorsPlugin : PluginBase {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
+  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTree", "3.3.0.$WCREV$")]
+  [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTree-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Core", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Data", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Random", "3.3.0.0")]
+  public class HeuristicLabEncodingsSymbolicExpressionTreePlugin : PluginBase {
   }
 }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Interfaces/IFunction.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.GP.Interfaces {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public interface IFunction : IItem {
     string Name { get; }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Interfaces/IFunctionTree.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.GP.Interfaces {
-  public interface IFunctionTree : IStorable {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
+  public interface IFunctionTree {
     bool HasLocalParameters { get; }
     IList<IFunctionTree> SubTrees { get; }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Manipulators/ChangeNodeTypeManipulation.cs

@@ -27 +27 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class ChangeNodeTypeManipulation : GPManipulatorBase {
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Manipulators/CutOutNodeManipulation.cs

@@ -27 +27 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class CutOutNodeManipulation : GPManipulatorBase {
     public override string Description {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Manipulators/DeleteSubTreeManipulation.cs

@@ -26 +26 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class DeleteSubTreeManipulation : GPManipulatorBase {
     public override string Description {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Manipulators/FullTreeShaker.cs

@@ -25 +25 @@
 using HeuristicLab.Random;
 using HeuristicLab.Data;
-using HeuristicLab.GP.Interfaces;
-using HeuristicLab.Selection;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class FullTreeShaker : DelegatingOperator {
     public override string Description {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Manipulators/GPManipulatorBase.cs

@@ -23 +23 @@
 using HeuristicLab.Random;
 using HeuristicLab.Data;
-using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public abstract class GPManipulatorBase : OperatorBase {
     public GPManipulatorBase()

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Manipulators/OnePointShaker.cs

@@ -25 +25 @@
 using HeuristicLab.Random;
 using HeuristicLab.Data;
-using HeuristicLab.Selection;
-using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class OnePointShaker : DelegatingOperator {
     public override string Description {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Manipulators/SubstituteSubTreeManipulation.cs

@@ -27 +27 @@
 using HeuristicLab.GP.Interfaces;
 
-namespace HeuristicLab.GP.Operators {
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
   public class SubstituteSubTreeManipulation : GPManipulatorBase {
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/Symbol.cs

@@ -24 +24 @@
 using System.Text;
 using HeuristicLab.Core;
-using System.Xml;
-using System.Diagnostics;
-using HeuristicLab.GP.Interfaces;
 using System.Linq;
 
-namespace HeuristicLab.GP {
-  public abstract class Function : ItemBase, IFunction {
-    private List<List<IFunction>> allowedSubFunctions = new List<List<IFunction>>();
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
+  public abstract class Symbol {
+    private List<List<Symbol>> allowedSubFunctions = new List<List<Symbol>>();
     private int minArity = -1;
     private int maxArity = -1;
@@ -88 +85 @@
             if (allowedSubFunctions.Count > 0) {
               // copy the list of allowed sub-functions from the previous slot
-              allowedSubFunctions.Add(new List<IFunction>(allowedSubFunctions[allowedSubFunctions.Count - 1]));
+              allowedSubFunctions.Add(new List<Symbol>(allowedSubFunctions[allowedSubFunctions.Count - 1]));
             } else {
               // add empty list
-              allowedSubFunctions.Add(new List<IFunction>());
+              allowedSubFunctions.Add(new List<Symbol>());
             }
           }
@@ -107 +104 @@
           FireChanged();
         }
-        Debug.Assert(minTreeSize > 0);
+        // Debug.Assert(minTreeSize > 0);
         return minTreeSize;
       }
@@ -118 +115 @@
           FireChanged();
         }
-        Debug.Assert(minTreeHeight > 0);
+        // Debug.Assert(minTreeHeight > 0);
         return minTreeHeight;
       }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/SymbolicExpressionTree.cs

@@ -24 +24 @@
 using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.GP.Interfaces;
 using System.Xml;
 
-namespace HeuristicLab.GP {
-  public class FunctionTree : IFunctionTree {
-    private List<IFunctionTree> subTrees;
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
+  public class SymbolicExpressionTree  {
+    private List<SymbolicExpressionTree> subTrees;
     private IFunction function;
 
-    public FunctionTree() {
+    public SymbolicExpressionTree() {
     }
 
-    public FunctionTree(IFunction function) {
-      subTrees = new List<IFunctionTree>();
+    public SymbolicExpressionTree(Symbol symbol) {
+      subTrees = new List<SymbolicExpressionTree>();
       this.function = function;
     }
 
-    protected FunctionTree(FunctionTree original) {
+    protected SymbolicExpressionTree(SymbolicExpressionTree original) {
       this.function = original.Function;
-      this.subTrees = new List<IFunctionTree>(original.SubTrees.Count);
-      foreach (IFunctionTree originalSubTree in original.SubTrees) {
-        this.SubTrees.Add((IFunctionTree)originalSubTree.Clone());
+      this.subTrees = new List<SymbolicExpressionTree>(original.SubTrees.Count);
+      foreach (SymbolicExpressionTree originalSubTree in original.SubTrees) {
+        this.SubTrees.Add((SymbolicExpressionTree)originalSubTree.Clone());
       }
     }
 
-    #region IFunctionTree Members
     public virtual bool HasLocalParameters {
       get { return false; }
     }
 
-    public virtual IList<IFunctionTree> SubTrees {
+    public virtual IList<SymbolicExpressionTree> SubTrees {
       get { return subTrees; }
     }
 
-    public IFunction Function {
+    public Symbol Function {
       get { return function; }
       protected set { function = value; }
@@ -64 +62 @@
     public int GetSize() {
       int size = 1;
-      foreach (IFunctionTree tree in SubTrees) size += tree.GetSize();
+      foreach (SymbolicExpressionTree tree in SubTrees) size += tree.GetSize();
       return size;
     }
@@ -70 +68 @@
     public int GetHeight() {
       int maxHeight = 0;
-      foreach (IFunctionTree tree in SubTrees) maxHeight = Math.Max(maxHeight, tree.GetHeight());
+      foreach (SymbolicExpressionTree tree in SubTrees) maxHeight = Math.Max(maxHeight, tree.GetHeight());
       return maxHeight + 1;
     }
@@ -82 +80 @@
     }
 
-    public void AddSubTree(IFunctionTree tree) {
+    public void AddSubTree(SymbolicExpressionTree tree) {
       SubTrees.Add(tree);
     }
 
-    public virtual void InsertSubTree(int index, IFunctionTree tree) {
+    public virtual void InsertSubTree(int index, SymbolicExpressionTree tree) {
       SubTrees.Insert(index, tree);
     }
@@ -98 +96 @@
     }
 
-    #endregion
 
     #region IStorable Members
@@ -107 +104 @@
 
     public virtual object Clone() {
-      return new FunctionTree(this);
+      return new SymbolicExpressionTree(this);
     }