Changeset 5640 for branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

Timestamp:

03/09/11 02:08:07 (13 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

File:

• branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs (modified) (4 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.Xml;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.RunCreation {
   [Item("OKB Algorithm", "An algorithm which is stored in the OKB.")]
   [Creatable("Optimization Knowledge Base (OKB)")]
@@ -75 +75 @@
     }
 
+    public IEnumerable<IOptimizer> NestedOptimizers {
+      get {
+        if (Algorithm == null) yield break;
+        yield return Algorithm;
+        foreach (IOptimizer optimizer in Algorithm.NestedOptimizers)
+          yield return optimizer;
+      }
+    }
+
     public override Image ItemImage {
       get { return Algorithm.ItemImage; }
@@ -126 +135 @@
       set { Algorithm.StoreAlgorithmInEachRun = value; }
     }
+
+
 
     #region Persistence Properties
@@ -184 +195 @@
       if (this.algorithmId != algorithmId) {
         IAlgorithm algorithm;
-        AlgorithmData algorithmData = OKBClient.Instance.GetAlgorithmData(algorithmId);
-        using (MemoryStream stream = new MemoryStream(algorithmData.Data)) {
+        byte[] algorithmData = RunCreationClient.GetAlgorithmData(algorithmId);
+        using (MemoryStream stream = new MemoryStream(algorithmData)) {
           algorithm = XmlParser.Deserialize<IAlgorithm>(stream);
         }