Changeset 2202 for branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionLibrary.cs

Timestamp:

07/28/09 19:24:23 (15 years ago)

Author:

gkronber

Message:

Created a branch for #713

Location:

branches/GP-Refactoring-713

Files:

• . (copied) (copied from trunk)
• sources/HeuristicLab.GP/3.3/FunctionLibrary.cs (copied) (copied from trunk/sources/HeuristicLab.GP/3.3/GPOperatorLibrary.cs) (1 diff)

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionLibrary.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using System.Xml;
+using HeuristicLab.Data;
+using HeuristicLab.Constraints;
 
 namespace HeuristicLab.GP {
-  public class GPOperatorLibrary : ItemBase, IOperatorLibrary, IEditable  {
-    // constants for variable names
-    internal const string MIN_TREE_HEIGHT = "MinTreeHeight";
-    internal const string MIN_TREE_SIZE = "MinTreeSize";
-    internal const string TICKETS = "Tickets";
-
-    private GPOperatorGroup group;
-
-    public GPOperatorGroup GPOperatorGroup {
-      get { return group; }
-    }
-    #region IOperatorLibrary Members
-
-    public IOperatorGroup Group {
-      get { return group; }
+  public class FunctionLibrary : ItemBase, IEditable {
+    private List<IFunction> functions = new List<IFunction>();
+    public IEnumerable<IFunction> Functions {
+      get { return functions; }
     }
 
-    #endregion
+    public FunctionLibrary()
+      : base() {
+    }
 
 
-    public GPOperatorLibrary()
-      : base() {
-      group = new GPOperatorGroup();
+    public void AddFunction(IFunction fun) {
+      if (!functions.Contains(fun)) functions.Add(fun);
+      // OnFunctionAdded(fun);
     }
 
-    public override IView CreateView() {
-      return new GPOperatorLibraryEditor(this);
+    //void UpdateTreeBounds(object sender, EventArgs e) {
+    //  RecalculateMinimalTreeBounds();
+    //}
+
+
+    //private void GetMinMaxArity(IOperator op, out int minArity, out int maxArity) {
+    //  foreach (IConstraint constraint in op.Constraints) {
+    //    NumberOfSubOperatorsConstraint theConstraint = constraint as NumberOfSubOperatorsConstraint;
+    //    if (theConstraint != null) {
+    //      minArity = theConstraint.MinOperators.Data;
+    //      maxArity = theConstraint.MaxOperators.Data;
+    //      return;
+    //    }
+    //  }
+    //  // the default arity is 2
+    //  minArity = 2;
+    //  maxArity = 2;
+    //}
+
+    public void RemoveFunction(IFunction fun) {
+      functions.Remove(fun);
+
+      // remove the operator from the allowed sub-functions of the remaining operators
+      foreach (IFunction f in Functions) {
+        if (f != fun) {
+        }
+      }
+      // OnFunctionRemoved(fun);
     }
 
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      GPOperatorLibrary clone = (GPOperatorLibrary)base.Clone(clonedObjects);
-      clone.group = (GPOperatorGroup)group.Clone(clonedObjects);
-      return clone;
+    //public event EventHandler FunctionAdded;
+    //public event EventHandler FunctionRemoved;
+
+    //protected virtual void OnFunctionAdded(IFunction fun) {
+    //  if (FunctionAdded != null) {
+    //    FunctionAdded(this, new EventArgs(fun));
+    //  }
+    //}
+    //protected virtual void OnFunctionRemoved(IFunction fun) {
+    //  if (FunctionRemoved != null) {
+    //    FunctionRemoved(this, new EventArgs(fun));
+    //  }
+    //}
+
+    public override IView CreateView() {
+      return new FunctionLibraryEditor(this);
     }
-
-    #region persistence
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      node.AppendChild(PersistenceManager.Persist("Group", group, document, persistedObjects));
-      return node;
-    }
-
-    public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      group = (GPOperatorGroup) PersistenceManager.Restore(node.SelectSingleNode("Group"), restoredObjects);
-    }
-    #endregion
 
     #region IEditable Members
 
     public IEditor CreateEditor() {
-      return new GPOperatorLibraryEditor(this);
+      return new FunctionLibraryEditor(this);
     }