Changeset 11718

Timestamp:

12/23/14 10:45:20 (10 years ago)

Author:

ehopf

Message:

#2278: Replaced the collect result values method in the ResultCollection-class.

File:

• branches/Classification-Extensions/HeuristicLab.Optimization/3.3/ResultCollection.cs (modified) (2 diffs)

branches/Classification-Extensions/HeuristicLab.Optimization/3.3/ResultCollection.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Linq;
 
-namespace HeuristicLab.Optimization {
+namespace HeuristicLab.Optimization {   
   [StorableClass]
   [Item("ResultCollection", "Represents a collection of results.")]
@@ -45 +46 @@
     }
 
-    public void CollectResultValues(IDictionary<string, IItem> values) {
-      CollectResultsRecursively("", this, values);
-    }
-    public void CollectResultValues(IDictionary<string, IItem> values, string resultsRootName) {
-      CollectResultsRecursively(resultsRootName, this, values);
+    public virtual void CollectResultValues(IDictionary<string, IItem> values) {
+      CollectResultValues(values, string.Empty);  
     }
 
-    protected void CollectResultsRecursively(string path, ResultCollection results, IDictionary<string, IItem> values) {
-      foreach (IResult result in results) {
-        values.Add(path + result.Name, result.Value);
-        ResultCollection childCollection = result.Value as ResultCollection;
-        if (childCollection != null) {
-          CollectResultsRecursively(path + result.Name + ".", childCollection, values);
+    public virtual void CollectResultValues(IDictionary<string, IItem> values, string rootPath) {
+      foreach (IResult result in this) {
+        var children = GetCollectedResults(result);
+        string path = string.Empty;
+        if (!string.IsNullOrWhiteSpace(rootPath))
+          path = rootPath + ".";
+        foreach (var c in children) {
+          if (string.IsNullOrEmpty(c.Key))
+            values.Add(path + result.Name, c.Value);
+          else values.Add(path + result.Name + "." + c.Key, c.Value);
         }
       }
     }
+
+    protected virtual IEnumerable<KeyValuePair<string, IItem>> GetCollectedResults(IResult result) {
+      if (result.Value == null) yield break;
+      yield return new KeyValuePair<string, IItem>(string.Empty, result.Value);
+      var resultCollection = result.Value as ResultCollection;
+      if (resultCollection != null) {       
+        var children = new Dictionary<string, IItem>();
+        resultCollection.CollectResultValues(children);
+        foreach (var child in children) yield return child;
+      }
+    }
+
   }
 }