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

Timestamp:

03/26/10 19:34:29 (14 years ago)

Author:

gkronber

Message:

Added work in progress for the artificial ant problem #952 (Artificial Ant Problem for 3.3) and for the symbolic expression tree encoding #937 (Data types and operators for symbolic expression tree encoding).

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Files:

• . (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree)
• 3.3/Symbol.cs (modified) (11 diffs)

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using System.Linq;
-
-namespace HeuristicLab.Encodings.SymbolicExpressionTree {
-  public abstract class Symbol {
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
+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;
@@ -44 +47 @@
         if (value != name) {
           name = value;
-          FireChanged();
-        }
-      }
-    }
-
-    protected Function() {
+        }
+      }
+    }
+
+    protected Symbol() {
       name = this.GetType().Name;
-    }
-
-    public virtual string Description {
-      get { return "Description for this function is missing (TODO)"; }
     }
 
@@ -65 +63 @@
         if (minArity != value) {
           minArity = value;
-          while (minArity > allowedSubFunctions.Count) allowedSubFunctions.Add(new List<IFunction>());
+          while (minArity > allowedSubFunctions.Count) allowedSubFunctions.Add(new List<Symbol>());
           ResetCachedValues();
-          FireChanged();
         }
       }
@@ -92 +89 @@
           }
           ResetCachedValues();
-          FireChanged();
         }
       }
@@ -102 +98 @@
         if (minTreeSize <= 0) {
           RecalculateMinimalTreeSize();
-          FireChanged();
         }
         // Debug.Assert(minTreeSize > 0);
@@ -113 +108 @@
         if (minTreeHeight <= 0) {
           RecalculateMinimalTreeHeight();
-          FireChanged();
         }
         // Debug.Assert(minTreeHeight > 0);
@@ -126 +120 @@
         if (value != tickets) {
           tickets = value;
-          FireChanged();
         }
       }
@@ -136 +129 @@
         if (initializer != value) {
           initializer = value;
-          FireChanged();
         }
       }
@@ -146 +138 @@
         if (manipulator != value) {
           manipulator = value;
-          FireChanged();
-        }
-      }
-    }
-
-    public virtual IFunctionTree GetTreeNode() {
-      return new FunctionTree(this);
-    }
-
-    public ICollection<IFunction> GetAllowedSubFunctions(int index) {
+        }
+      }
+    }
+
+    public virtual SymbolicExpressionTreeNode CreateTreeNode() {
+      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(IFunction function, int 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<IFunction>();
-      }
-      if (!allowedSubFunctions[index].Contains(function)) {
-        allowedSubFunctions[index].Add(function);
+        allowedSubFunctions[index] = new List<Symbol>();
+      }
+      if (!allowedSubFunctions[index].Contains(symbol)) {
+        allowedSubFunctions[index].Add(symbol);
       }
       ResetCachedValues();
-      FireChanged();
-    }
-    public void RemoveAllowedSubFunction(IFunction function, int index) {
+    }
+    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(function)) {
-        allowedSubFunctions[index].Remove(function);
+      if (allowedSubFunctions[index].Contains(symbol)) {
+        allowedSubFunctions[index].Remove(symbol);
         ResetCachedValues();
-        FireChanged();
       }
     }
@@ -185 +174 @@
     }
 
-    public bool IsAllowedSubFunction(IFunction function, int index) {
-      return GetAllowedSubFunctions(index).Contains(function);
+    public bool IsAllowedSubFunction(Symbol symbol, int index) {
+      return GetAllowedSubFunctions(index).Contains(symbol);
     }
 
@@ -213 +202 @@
     }
 
-    public override IView CreateView() {
-      return new FunctionView(this);
-    }
-
     public override string ToString() {
       return name;
     }
-
-    #region persistence
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Function clone = (Function)base.Clone(clonedObjects);
-      if (initializer != null) clone.initializer = (IOperator)Auxiliary.Clone(initializer, clonedObjects);
-      else clone.initializer = null;
-      if (manipulator != null) clone.manipulator = (IOperator)Auxiliary.Clone(manipulator, clonedObjects);
-      else clone.manipulator = null;
-      clone.MaxSubTrees = maxArity;
-      clone.MinSubTrees = minArity;
-      clone.Tickets = tickets;
-      clone.allowedSubFunctions.Clear();
-      for (int i = 0; i < MaxSubTrees; i++) {
-        var allowedSubFunctionsForSlot = new List<IFunction>();
-        foreach (IFunction f in GetAllowedSubFunctions(i)) {
-          allowedSubFunctionsForSlot.Add((IFunction)Auxiliary.Clone(f, clonedObjects));
-        }
-        clone.allowedSubFunctions.Add(allowedSubFunctionsForSlot);
-      }
-      return clone;
-    }
-
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      XmlAttribute minSubTreesAttr = document.CreateAttribute("MinSubTrees");
-      minSubTreesAttr.Value = XmlConvert.ToString(MinSubTrees);
-      XmlAttribute maxSubTreesAttr = document.CreateAttribute("MaxSubTrees");
-      maxSubTreesAttr.Value = XmlConvert.ToString(MaxSubTrees);
-      node.Attributes.Append(minSubTreesAttr);
-      node.Attributes.Append(maxSubTreesAttr);
-      if (initializer != null)
-        node.AppendChild(PersistenceManager.Persist("Initializer", initializer, document, persistedObjects));
-      if (manipulator != null)
-        node.AppendChild(PersistenceManager.Persist("Manipulator", manipulator, document, persistedObjects));
-      for (int i = 0; i < MaxSubTrees; i++) {
-        XmlNode slotNode = document.CreateElement("AllowedSubFunctions");
-        XmlAttribute slotAttr = document.CreateAttribute("Slot");
-        slotAttr.Value = XmlConvert.ToString(i);
-        slotNode.Attributes.Append(slotAttr);
-        node.AppendChild(slotNode);
-        foreach (IFunction f in GetAllowedSubFunctions(i)) {
-          slotNode.AppendChild(PersistenceManager.Persist(f, document, persistedObjects));
-        }
-      }
-      return node;
-    }
-
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      MinSubTrees = XmlConvert.ToInt32(node.Attributes["MinSubTrees"].Value);
-      MaxSubTrees = XmlConvert.ToInt32(node.Attributes["MaxSubTrees"].Value);
-      if (node.SelectSingleNode("Initializer") != null) {
-        initializer = (IOperator)PersistenceManager.Restore(node.SelectSingleNode("Initializer"), restoredObjects);
-      }
-      if (node.SelectSingleNode("Manipulator") != null) {
-        manipulator = (IOperator)PersistenceManager.Restore(node.SelectSingleNode("Manipulator"), restoredObjects);
-      }
-      foreach (var subFunctionsList in allowedSubFunctions) subFunctionsList.Clear();
-      foreach (XmlNode allowedSubFunctionsNode in node.SelectNodes("AllowedSubFunctions")) {
-        int slot = XmlConvert.ToInt32(allowedSubFunctionsNode.Attributes["Slot"].Value);
-        foreach (XmlNode fNode in allowedSubFunctionsNode.ChildNodes) {
-          AddAllowedSubFunction((IFunction)PersistenceManager.Restore(fNode, restoredObjects), slot);
-        }
-      }
-    }
-    #endregion
   }
 }