Changeset 890

Timestamp:

12/03/08 07:14:04 (16 years ago)

Author:

gkronber

Message:

worked on clone refactoring in HL.GP.

#285 (Cloning could be improved by creating objects at the bottom of the cloning chain with 'new' instead of the top with Activator.CreateInstance())

Location:

branches/CloningRefactorBranch

Files:

• HeuristicLab.GP.Boolean/HeuristicLabGPBooleanPlugin.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/Constant.cs (modified) (2 diffs)
• HeuristicLab.GP/BakedFunctionTree.cs (modified) (3 diffs)
• HeuristicLab.GP/FunctionBase.cs (modified) (1 diff)
• HeuristicLab.GP/GPOperatorLibrary.cs (modified) (4 diffs)

branches/CloningRefactorBranch/HeuristicLab.GP.Boolean/HeuristicLabGPBooleanPlugin.cs

@@ -25 +25 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.GP.SantaFe {
+namespace HeuristicLab.GP.Boolean {
   [ClassInfo(Name = "HeuristicLab.GP.Boolean-1.0")]
   [PluginFile(Filename = "HeuristicLab.GP.Boolean-1.0.dll", Filetype = PluginFileType.Assembly)]

branches/CloningRefactorBranch/HeuristicLab.GP.StructureIdentification/Constant.cs

@@ -57 +57 @@
     }
 
+    public Constant(Constant original) : this(original, new Dictionary<Guid, object>()) { }
+    private Constant(Constant original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) { }
+
     private void SetupInitialization() {
       // initialization operator
@@ -90 +94 @@
       AddVariable(new HeuristicLab.Core.Variable(MANIPULATION, combinedOp));
     }
+
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      return new Constant(this, clonedObjects);
+    }
   }
 }

branches/CloningRefactorBranch/HeuristicLab.GP/BakedFunctionTree.cs

@@ -90 +90 @@
       foreach(IFunctionTree subTree in tree.SubTrees) {
         AddSubTree(new BakedFunctionTree(subTree));
+      }
+    }
+
+    public BakedFunctionTree(BakedFunctionTree original) : this(original, new Dictionary<Guid, object>()) { }
+    protected BakedFunctionTree(BakedFunctionTree original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      // in case the user (de)serialized the tree between evaluation and selection we have to flatten the tree again.
+      if (original.treesExpanded) original.FlattenTrees();
+      if (original.variablesExpanded) original.FlattenVariables();
+      foreach (LightWeightFunction f in original.linearRepresentation) {
+        this.linearRepresentation.Add(f.Clone());
       }
     }
@@ -325 +336 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      BakedFunctionTree clone = new BakedFunctionTree();
-      // in case the user (de)serialized the tree between evaluation and selection we have to flatten the tree again.
-      if(treesExpanded) FlattenTrees();
-      if(variablesExpanded) FlattenVariables();
-      foreach(LightWeightFunction f in linearRepresentation) {
-        clone.linearRepresentation.Add(f.Clone());
-      }
-      return clone;
+      return new BakedFunctionTree(this, clonedObjects);
     }
 
@@ -338 +342 @@
       return new FunctionTreeView(this);
     }
-
-    //public override string ToString() {
-    //  SymbolicExpressionExporter exporter = new SymbolicExpressionExporter();
-    //  exporter.Visit(this);
-    //  return exporter.GetStringRepresentation();
-    //}
   }
 }

branches/CloningRefactorBranch/HeuristicLab.GP/FunctionBase.cs

@@ -40 +40 @@
     private int minArity = -1;
     private int maxArity = -1;
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    protected FunctionBase() { }
+
+    protected FunctionBase(FunctionBase original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.minArity = original.minArity;
+      this.maxArity = original.maxArity;
+    }
 
     public virtual double Apply() {

branches/CloningRefactorBranch/HeuristicLab.GP/GPOperatorLibrary.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.GP {
-  public class GPOperatorLibrary : ItemBase, IOperatorLibrary, IEditable  {
+  public class GPOperatorLibrary : ItemBase, IOperatorLibrary, IEditable {
     // constants for variable names
     internal const string MIN_TREE_HEIGHT = "MinTreeHeight";
@@ -39 +39 @@
       get { return group; }
     }
+    public GPOperatorLibrary(GPOperatorLibrary original) : this(original, new Dictionary<Guid, object>()) { }
+    protected GPOperatorLibrary(GPOperatorLibrary original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.group = (GPOperatorGroup)Auxiliary.Clone(original.group, clonedObjects);
+    }
+
     #region IOperatorLibrary Members
 
@@ -58 +64 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      GPOperatorLibrary clone = (GPOperatorLibrary)base.Clone(clonedObjects);
-      clone.group = (GPOperatorGroup)group.Clone(clonedObjects);
-      return clone;
+      return new GPOperatorLibrary(this, clonedObjects);
     }
 
@@ -72 +76 @@
     public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      group = (GPOperatorGroup) PersistenceManager.Restore(node.SelectSingleNode("Group"), restoredObjects);
+      group = (GPOperatorGroup)PersistenceManager.Restore(node.SelectSingleNode("Group"), restoredObjects);
     }
     #endregion