Changeset 2700 for trunk

Timestamp:

01/28/10 16:42:24 (15 years ago)

Author:

gkronber

Message:

Renamed FunctionBase to Function and FunctionTreeBase to FunctionTree. #748 (FunctionLibraryView is empty).

Location:

trunk/sources

Files:

• HeuristicLab.GP.SantaFe/3.3/Symbols/Prog3.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenAddition.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenDivision.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenMultiplication.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenSubtraction.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/FunctionTreeBase.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/Addition.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/And.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/Average.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/Division.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/IfThenElse.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/Multiplication.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/Or.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/Subtraction.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/BaseClasses/BinaryFunction.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/BaseClasses/Function.cs (moved) (moved from trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionBase.cs) (12 diffs)
• HeuristicLab.GP/3.3/BaseClasses/FunctionTree.cs (moved) (moved from trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionTreeBase.cs) (2 diffs)
• HeuristicLab.GP/3.3/BaseClasses/Terminal.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/BaseClasses/TerminalTreeNode.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/BaseClasses/UnaryFunction.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.SantaFe/3.3/Symbols/Prog3.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.GP.SantaFe {
-  public sealed class Prog3 : FunctionBase {
+  public sealed class Prog3 : Function {
 
     public Prog3()

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenAddition.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification.Networks {
-  public sealed class OpenAddition : FunctionBase {
+  public sealed class OpenAddition : Function {
     public override string Description {
       get { return "Unbound +."; }

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenDivision.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification.Networks {
-  public sealed class OpenDivision : FunctionBase {
+  public sealed class OpenDivision : Function {
     public override string Description {
       get { return "Unbound /."; }

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenMultiplication.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification.Networks {
-  public sealed class OpenMultiplication : FunctionBase {
+  public sealed class OpenMultiplication : Function {
     public override string Description {
       get { return "Unbound *."; }

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenSubtraction.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification.Networks {
-  public sealed class OpenSubtraction : FunctionBase {
+  public sealed class OpenSubtraction : Function {
     public override string Description {
       get { return "Unbound -."; }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/FunctionTreeBase.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class FunctionTreeBase : HeuristicLab.GP.FunctionTreeBase {
+  public class FunctionTreeBase : HeuristicLab.GP.FunctionTree {
     public FunctionTreeBase(IFunction function) : base(function) { }
     public FunctionTreeBase(FunctionTreeBase original) : base(original) { }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Addition.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Addition : FunctionBase {
+  public sealed class Addition : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/And.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class And : FunctionBase {
+  public sealed class And : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Average.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Average : FunctionBase {
+  public sealed class Average : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Division.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Division : FunctionBase {
+  public sealed class Division : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/IfThenElse.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class IfThenElse : FunctionBase {
+  public sealed class IfThenElse : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Multiplication.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Multiplication : FunctionBase {
+  public sealed class Multiplication : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Or.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Or : FunctionBase {
+  public sealed class Or : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Subtraction.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Subtraction : FunctionBase {
+  public sealed class Subtraction : Function {
     public override string Description {
       get {

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/BinaryFunction.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.GP {
-  public abstract class BinaryFunction : FunctionBase {
+  public abstract class BinaryFunction : Function {
     public BinaryFunction()
       : base() {

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/Function.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.GP {
-  public abstract class FunctionBase : ItemBase, IFunction {
+  public abstract class Function : ItemBase, IFunction {
     private List<List<IFunction>> allowedSubFunctions = new List<List<IFunction>>();
     private int minArity = -1;
@@ -40 +40 @@
     private int minTreeSize = -1;
 
+    private string name;
     public virtual string Name {
-      get { return this.GetType().Name; }
+      get { return name; }
+      set {
+        if (string.IsNullOrEmpty(value)) throw new ArgumentException();
+        if (value != name) {
+          name = value;
+          FireChanged();
+        }
+      }
+    }
+
+    protected Function() {
+      name = this.GetType().Name;
     }
 
@@ -52 +64 @@
         return minArity;
       }
-      protected set {
-        minArity = value;
-        while (minArity > allowedSubFunctions.Count) allowedSubFunctions.Add(new List<IFunction>());
+      protected internal set {
+        if (value < 0) throw new ArgumentException();
+        if (minArity != value) {
+          minArity = value;
+          while (minArity > allowedSubFunctions.Count) allowedSubFunctions.Add(new List<IFunction>());
+          ResetCachedValues();
+          FireChanged();
+        }
       }
     }
@@ -62 +79 @@
         return maxArity;
       }
-      protected set {
-        maxArity = value;
-        while (allowedSubFunctions.Count > maxArity) allowedSubFunctions.RemoveAt(allowedSubFunctions.Count - 1);
-        while (maxArity > allowedSubFunctions.Count) allowedSubFunctions.Add(new List<IFunction>());
+      protected internal set {
+        if (value < 0) throw new ArgumentException();
+        if (value < minArity) throw new ArgumentException();
+        if (value != maxArity) {
+          maxArity = value;
+          while (allowedSubFunctions.Count > maxArity) allowedSubFunctions.RemoveAt(allowedSubFunctions.Count - 1);
+          while (maxArity > allowedSubFunctions.Count) {
+            if (allowedSubFunctions.Count > 0) {
+              // copy the list of allowed sub-functions from the previous slot
+              allowedSubFunctions.Add(new List<IFunction>(allowedSubFunctions[allowedSubFunctions.Count - 1]));
+            } else {
+              // add empty list
+              allowedSubFunctions.Add(new List<IFunction>());
+            }
+          }
+          ResetCachedValues();
+          FireChanged();
+        }
       }
     }
@@ -72 +103 @@
     public int MinTreeSize {
       get {
-        if (minTreeSize <= 0) RecalculateMinimalTreeSize();
+        if (minTreeSize <= 0) {
+          RecalculateMinimalTreeSize();
+          FireChanged();
+        }
         Debug.Assert(minTreeSize > 0);
         return minTreeSize;
@@ -80 +114 @@
     public int MinTreeHeight {
       get {
-        if (minTreeHeight <= 0) RecalculateMinimalTreeHeight();
+        if (minTreeHeight <= 0) {
+          RecalculateMinimalTreeHeight();
+          FireChanged();
+        }
         Debug.Assert(minTreeHeight > 0);
         return minTreeHeight;
@@ -90 +127 @@
       set {
         if (value < 0.0) throw new ArgumentException("Number of tickets must be positive");
-        else tickets = value;
+        if (value != tickets) {
+          tickets = value;
+          FireChanged();
+        }
       }
     }
@@ -96 +136 @@
     public IOperator Initializer {
       get { return initializer; }
-      set { initializer = value; }
+      set {
+        if (initializer != value) {
+          initializer = value;
+          FireChanged();
+        }
+      }
     }
 
     public IOperator Manipulator {
       get { return manipulator; }
-      set { manipulator = value; }
+      set {
+        if (manipulator != value) {
+          manipulator = value;
+          FireChanged();
+        }
+      }
     }
 
     public virtual IFunctionTree GetTreeNode() {
-      return new FunctionTreeBase(this);
+      return new FunctionTree(this);
     }
 
@@ -121 +171 @@
         allowedSubFunctions[index].Add(function);
       }
-    }
-
+      ResetCachedValues();
+      FireChanged();
+    }
     public void RemoveAllowedSubFunction(IFunction function, int index) {
       if (index < 0 || index > MaxSubTrees) throw new ArgumentException("Index outside of allowed range. index = " + index);
-      allowedSubFunctions[index].Add(function);
+      if (allowedSubFunctions[index].Contains(function)) {
+        allowedSubFunctions[index].Remove(function);
+        ResetCachedValues();
+        FireChanged();
+      }
+    }
+
+    private void ResetCachedValues() {
+      minTreeHeight = -1;
+      minTreeSize = -1;
     }
 
@@ -135 +195 @@
       if (MinSubTrees == 0) minTreeSize = 1;
       else {
-        minTreeSize = int.MaxValue; // prevent infinite recursion
+        minTreeSize = int.MaxValue; // prevent infinite recursion        
         minTreeSize = 1 + (from slot in Enumerable.Range(0, MinSubTrees)
                            let minForSlot = (from function in GetAllowedSubFunctions(slot)
                                              where function != this
-                                             select function.MinTreeSize).Min()
+                                             select function.MinTreeSize).DefaultIfEmpty(0).Min()
                            select minForSlot).Sum();
       }
@@ -151 +211 @@
                              let minForSlot = (from function in GetAllowedSubFunctions(slot)
                                                where function != this
-                                               select function.MinTreeHeight).Min()
+                                               select function.MinTreeHeight).DefaultIfEmpty(0).Min()
                              select minForSlot).Max();
       }
     }
 
+    public override IView CreateView() {
+      return new FunctionView(this);
+    }
+
+    public override string ToString() {
+      return name;
+    }
+
+    #region persistence
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      FunctionBase clone = (FunctionBase)base.Clone(clonedObjects);
+      Function clone = (Function)base.Clone(clonedObjects);
       clone.initializer = (IOperator)Auxiliary.Clone(initializer, clonedObjects);
       clone.manipulator = (IOperator)Auxiliary.Clone(manipulator, clonedObjects);
@@ -207 +276 @@
       }
     }
+    #endregion
   }
 }

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionTree.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.GP {
-  public class FunctionTreeBase : IFunctionTree {
+  public class FunctionTree : IFunctionTree {
     private List<IFunctionTree> subTrees;
     private IFunction function;
 
-    public FunctionTreeBase() {
+    public FunctionTree() {
     }
 
-    public FunctionTreeBase(IFunction function) {
+    public FunctionTree(IFunction function) {
       subTrees = new List<IFunctionTree>();
       this.function = function;
     }
 
-    protected FunctionTreeBase(FunctionTreeBase original) {
+    protected FunctionTree(FunctionTree original) {
       this.function = original.Function;
       this.subTrees = new List<IFunctionTree>(original.SubTrees.Count);
@@ -107 +107 @@
 
     public virtual object Clone() {
-      return new FunctionTreeBase(this);
+      return new FunctionTree(this);
     }
 

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/Terminal.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.GP {
-  public abstract class Terminal : FunctionBase {
+  public abstract class Terminal : Function {
     public Terminal()
       : base() {

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/TerminalTreeNode.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.GP {
-  public class TerminalTreeNode : FunctionTreeBase {
+  public class TerminalTreeNode : FunctionTree {
     private static readonly IList<IFunctionTree> subTrees = new List<IFunctionTree>().AsReadOnly();
     public TerminalTreeNode(IFunction function) {

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/UnaryFunction.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.GP {
-  public abstract class UnaryFunction : FunctionBase {
+  public abstract class UnaryFunction : Function {
     public UnaryFunction()
       : base() {