Changeset 6250 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

05/23/11 14:47:27 (14 years ago)

Author:

gkronber

Message:

#1450 added flattening of sub-results in ensemble solutions for classification and regression in the cross-validation.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -404 +404 @@
           solutions.Value.Select(x => x.ProblemData.TestPartition));
 
-        aggregatedResults.Add(new Result(solutions.Key, ensembleSolution));
-      }
-      return aggregatedResults;
+        aggregatedResults.Add(new Result(solutions.Key + " (ensemble)", ensembleSolution));
+      }
+      List<IResult> flattenedResults = new List<IResult>();
+      CollectResultsRecursively("", aggregatedResults, flattenedResults);
+      return flattenedResults;
     }
 
@@ -421 +423 @@
         }
       }
-      List<IResult> aggregatedResults = new List<IResult>();
+      var aggregatedResults = new List<IResult>();
       foreach (KeyValuePair<string, List<IClassificationSolution>> solutions in resultSolutions) {
         var problemDataClone = (IClassificationProblemData)Problem.ProblemData.Clone();
@@ -430 +432 @@
           solutions.Value.Select(x => x.ProblemData.TestPartition));
 
-        aggregatedResults.Add(new Result(solutions.Key, ensembleSolution));
-      }
-      return aggregatedResults;
+        aggregatedResults.Add(new Result(solutions.Key + " (ensemble)", ensembleSolution));
+      }
+      List<IResult> flattenedResults = new List<IResult>();
+      CollectResultsRecursively("", aggregatedResults, flattenedResults);
+      return flattenedResults;
+    }
+
+    private void CollectResultsRecursively(string path, IEnumerable<IResult> results, IList<IResult> flattenedResults) {
+      foreach (IResult result in results) {
+        flattenedResults.Add(new Result(path + result.Name, result.Value));
+        ResultCollection childCollection = result.Value as ResultCollection;
+        if (childCollection != null) {
+          CollectResultsRecursively(path + result.Name + ".", childCollection, flattenedResults);
+        }
+      }
     }
 
@@ -457 +471 @@
       foreach (KeyValuePair<string, List<double>> resultValue in resultValues) {
         doubleValue.Value = resultValue.Value.Average();
-        aggregatedResults.Add(new Result(resultValue.Key, (IItem)doubleValue.Clone()));
+        aggregatedResults.Add(new Result(resultValue.Key + " (average)", (IItem)doubleValue.Clone()));
         doubleValue.Value = resultValue.Value.StandardDeviation();
-        aggregatedResults.Add(new Result(resultValue.Key + " StdDev", (IItem)doubleValue.Clone()));
+        aggregatedResults.Add(new Result(resultValue.Key + " (std.dev.)", (IItem)doubleValue.Clone()));
       }
       return aggregatedResults;