Changeset 2377 for trunk/sources

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

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Server/3.3/DispatcherView.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs (modified) (1 diff)
• HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs (modified) (5 diffs)
• HeuristicLab.LinearRegression/3.2/LinearRegression.cs (modified) (3 diffs)
• HeuristicLab.Modeling/3.2/IAlgorithm.cs (modified) (1 diff)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherView.cs

@@ -101 +101 @@
       testSamplesStartTextBox.Text = selectedSpec.TestSamplesStart.ToString();
       testSamplesEndTextBox.Text = selectedSpec.TestSamplesEnd.ToString();
+      minTimeOffsetTextBox.Text = selectedSpec.MinTimeOffset.ToString();
+      maxTimeOffsetTextBox.Text = selectedSpec.MaxTimeOffset.ToString();
+      autoregressiveCheckBox.Checked = selectedSpec.AutoRegressive;
     }
 
@@ -134 +137 @@
 
     private void radioButton_CheckedChanged(object sender, EventArgs e) {
-      string selectedTarget = (string)targetVariableList.SelectedItem;
       minTimeOffsetLabel.Enabled = timeSeriesRadioButton.Checked;
       minTimeOffsetTextBox.Enabled = timeSeriesRadioButton.Checked;
@@ -144 +146 @@
       else if (classificationRadioButton.Checked) selectedSpec.LearningTask = LearningTask.Classification;
       else if (regressionRadioButton.Checked) selectedSpec.LearningTask = LearningTask.Regression;
+      var allowedAlgorithms = dispatcher.GetAllowedAlgorithms(selectedSpec.TargetVariable);
+      foreach (var algo in allowedAlgorithms) {
+        dispatcher.DisableAlgorithm(selectedSpec.TargetVariable, algo);
+      }
       UpdateAlgorithms();
     }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs

@@ -145 +145 @@
       if (possibleAlgos.Count() > 0) selectedAlgorithm = possibleAlgos.ElementAt(random.Next(possibleAlgos.Count()));
       if (selectedAlgorithm != null) {
+        // create a clone of the algorithm template before setting the parameters
+        selectedAlgorithm = (HeuristicLab.Modeling.IAlgorithm)selectedAlgorithm.Clone(); 
         SetProblemParameters(selectedAlgorithm, problemSpecifications[targetVariable]);
         if (!(selectedAlgorithm is IStochasticAlgorithm))

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
-
-
   }
 }

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearRegression.cs

@@ -42 +42 @@
     public virtual string Description { get { return "TODO"; } }
 
-    private SequentialEngine.SequentialEngine engine;
+    private IEngine engine;
     public virtual IEngine Engine {
       get { return engine; }
@@ -135 +135 @@
 
       HL3TreeEvaluatorInjector treeEvaluatorInjector = new HL3TreeEvaluatorInjector();
-
 
       LinearRegressionOperator lrOperator = new LinearRegressionOperator();
@@ -250 +249 @@
 
     public virtual IEditor CreateEditor() {
-      return engine.CreateEditor();
-    }
-
+      return ((SequentialEngine.SequentialEngine)engine).CreateEditor();
+    }
+
+    #endregion
+
+    #region persistence
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      LinearRegression clone = (LinearRegression) 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);
+      node.AppendChild(PersistenceManager.Persist("Engine", engine, document, persistedObjects));
+      return node;
+    }
+
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(node, restoredObjects);
+      engine = (IEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
+    }
     #endregion
   }

trunk/sources/HeuristicLab.Modeling/3.2/IAlgorithm.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Modeling {
-  public interface IAlgorithm {
+  public interface IAlgorithm : ICloneable {
     string Name { get; }
     string Description { get; }

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs

@@ -42 +42 @@
     public virtual string Description { get { return "TODO"; } }
 
-    private SequentialEngine.SequentialEngine engine;
+    private IEngine engine;
     public IEngine Engine {
       get { return engine; }
@@ -490 +490 @@
 
     public IEditor CreateEditor() {
-      return engine.CreateEditor();
-    }
-
+      return ((SequentialEngine.SequentialEngine)engine).CreateEditor();
+    }
+
+    #endregion
+
+    #region persistence
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      SupportVectorRegression clone = (SupportVectorRegression) 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);
+      node.AppendChild(PersistenceManager.Persist("Engine", engine, document, persistedObjects));
+      return node;
+    }
+
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(node, restoredObjects);
+      engine = (IEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
+    }
     #endregion
   }