Changeset 2377 for trunk/sources/HeuristicLab.GP.Algorithms

Timestamp:

09/22/09 11:45:04 (15 years ago)

Author:

gkronber

Message:

• Implemented cloning and persistence in data-modeling algorithms.
• Fixed bugs in CEDMA controller.

#754

File:

• trunk/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs

@@ -106 +106 @@
     }
 
-    private IOperator algorithm;
-
-    private SequentialEngine.SequentialEngine engine;
+    private IEngine engine;
     public IEngine Engine {
       get { return engine; }
-      protected set { engine = (SequentialEngine.SequentialEngine)value; }
+      protected set { engine = value; }
     }
 
@@ -158 +156 @@
       algo.OperatorGraph.AddOperator(seq);
       algo.OperatorGraph.InitialOperator = seq;
-      this.algorithm = seq;
       return algo;
     }
@@ -466 +463 @@
     }
 
-
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      AlgorithmBase clone = (AlgorithmBase)base.Clone(clonedObjects);
-      clonedObjects.Add(Guid, clone);
-      clone.engine = (SequentialEngine.SequentialEngine)Auxiliary.Clone(Engine, clonedObjects);
-      return clone;
-    }
-
     protected virtual IOperator GetVariableInjector() {
       CombinedOperator init = (CombinedOperator)GetInitializationOperator();
@@ -485 +474 @@
 
     protected virtual IOperator GetInitializationOperator() {
-      return algorithm.SubOperators[0];
+      CombinedOperator algo = (CombinedOperator)Engine.OperatorGraph.InitialOperator;
+      return algo.OperatorGraph.InitialOperator.SubOperators[0];
     }
 
     #region Persistence Methods
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      AlgorithmBase clone = (AlgorithmBase)base.Clone(clonedObjects);
+      clone.engine = (IEngine)Auxiliary.Clone(Engine, clonedObjects);
+      return clone;
+    }
+
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
@@ -496 +492 @@
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      engine = (SequentialEngine.SequentialEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
+      engine = (IEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
     }
     #endregion
-
-
   }
 }