Changeset 3269 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Symbol.cs

Timestamp:

04/05/10 18:52:23 (14 years ago)

Author:

gkronber

Message:

Implemented initialization of Variable and Constant terminal nodes. #938 (Data types and operators for regression problems)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Symbol.cs (modified) (2 diffs)

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

@@ -26 +26 @@
 using System.Linq;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   [StorableClass]
   [Item("Symbol", "Represents a symbol in a symbolic function tree.")]
-  public abstract class Symbol : Item {
-    private List<List<Symbol>> allowedSubFunctions = new List<List<Symbol>>();
-    private int minArity = -1;
-    private int maxArity = -1;
-    private double tickets = 1.0;
-    private IOperator initializer;
-    private IOperator manipulator;
-    private int minTreeHeight = -1;
-    private int minTreeSize = -1;
+  public abstract class Symbol : ParameterizedNamedItem {
+    #region Parameter Properties
+    public IValueParameter<DoubleValue> TicketsParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters["Tickets"]; }
+    }
+    #endregion
 
-    private string name;
-    public virtual string Name {
-      get { return name; }
+    #region Properties
+    public DoubleValue Tickets {
+      get { return TicketsParameter.Value; }
       set {
-        if (string.IsNullOrEmpty(value)) throw new ArgumentException();
-        if (value != name) {
-          name = value;
-        }
+        if (value.Value < 0.0) throw new ArgumentException("Number of tickets must be positive");
+        TicketsParameter.Value = value;
       }
     }
+    #endregion
 
-    protected Symbol() {
-      name = this.GetType().Name;
-    }
-
-    public int MinSubTrees {
-      get {
-        return minArity;
-      }
-      protected internal set {
-        if (value < 0) throw new ArgumentException();
-        if (minArity != value) {
-          minArity = value;
-          while (minArity > allowedSubFunctions.Count) allowedSubFunctions.Add(new List<Symbol>());
-          ResetCachedValues();
-        }
-      }
-    }
-
-    public int MaxSubTrees {
-      get {
-        return maxArity;
-      }
-      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<Symbol>(allowedSubFunctions[allowedSubFunctions.Count - 1]));
-            } else {
-              // add empty list
-              allowedSubFunctions.Add(new List<Symbol>());
-            }
-          }
-          ResetCachedValues();
-        }
-      }
-    }
-
-
-    public int MinTreeSize {
-      get {
-        if (minTreeSize <= 0) {
-          RecalculateMinimalTreeSize();
-        }
-        // Debug.Assert(minTreeSize > 0);
-        return minTreeSize;
-      }
-    }
-
-    public int MinTreeHeight {
-      get {
-        if (minTreeHeight <= 0) {
-          RecalculateMinimalTreeHeight();
-        }
-        // Debug.Assert(minTreeHeight > 0);
-        return minTreeHeight;
-      }
-    }
-
-    public double Tickets {
-      get { return tickets; }
-      set {
-        if (value < 0.0) throw new ArgumentException("Number of tickets must be positive");
-        if (value != tickets) {
-          tickets = value;
-        }
-      }
-    }
-
-    public IOperator Initializer {
-      get { return initializer; }
-      set {
-        if (initializer != value) {
-          initializer = value;
-        }
-      }
-    }
-
-    public IOperator Manipulator {
-      get { return manipulator; }
-      set {
-        if (manipulator != value) {
-          manipulator = value;
-        }
-      }
+    protected Symbol()
+      : base() {
+      Parameters.Add(new ValueParameter<DoubleValue>("Tickets", new DoubleValue(1.0)));
     }
 
@@ -145 +57 @@
       return new SymbolicExpressionTreeNode(this);
     }
-
-    public IEnumerable<Symbol> GetAllowedSubFunctions(int index) {
-      if (index < 0 || index > MaxSubTrees) throw new ArgumentException("Index outside of allowed range. index = " + index);
-      return allowedSubFunctions[index];
-    }
-
-    public void AddAllowedSubFunction(Symbol symbol, int index) {
-      if (index < 0 || index > MaxSubTrees) throw new ArgumentException("Index outside of allowed range. index = " + index);
-      if (allowedSubFunctions[index] == null) {
-        allowedSubFunctions[index] = new List<Symbol>();
-      }
-      if (!allowedSubFunctions[index].Contains(symbol)) {
-        allowedSubFunctions[index].Add(symbol);
-      }
-      ResetCachedValues();
-    }
-    public void RemoveAllowedSubFunction(Symbol symbol, int index) {
-      if (index < 0 || index > MaxSubTrees) throw new ArgumentException("Index outside of allowed range. index = " + index);
-      if (allowedSubFunctions[index].Contains(symbol)) {
-        allowedSubFunctions[index].Remove(symbol);
-        ResetCachedValues();
-      }
-    }
-
-    private void ResetCachedValues() {
-      minTreeHeight = -1;
-      minTreeSize = -1;
-    }
-
-    public bool IsAllowedSubFunction(Symbol symbol, int index) {
-      return GetAllowedSubFunctions(index).Contains(symbol);
-    }
-
-    private void RecalculateMinimalTreeSize() {
-      if (MinSubTrees == 0) minTreeSize = 1;
-      else {
-        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).DefaultIfEmpty(0).Min()
-                           select minForSlot).Sum();
-      }
-    }
-
-    private void RecalculateMinimalTreeHeight() {
-      if (MinSubTrees == 0) minTreeHeight = 1;
-      else {
-        minTreeHeight = int.MaxValue;
-        minTreeHeight = 1 + (from slot in Enumerable.Range(0, MinSubTrees)
-                             let minForSlot = (from function in GetAllowedSubFunctions(slot)
-                                               where function != this
-                                               select function.MinTreeHeight).DefaultIfEmpty(0).Min()
-                             select minForSlot).Max();
-      }
-    }
-
-    public override string ToString() {
-      return name;
-    }
   }
 }