Changeset 9198

Timestamp:

01/31/13 14:39:34 (12 years ago)

Author:

ascheibe

Message:

#1886 added calculation of the overall parameter influence

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ParameterInfluenceView.cs (modified) (4 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ParameterInfluenceView.cs

@@ -140 +140 @@
     }
 
-    private List<string> GetColumnNames(string parameterToExclude) {
+    private List<string> GetColumnNames() {
       string resultName = (string)resultComboBox.SelectedItem;
       var runs = Content.Where(x => x.Results.ContainsKey(resultName) && x.Visible);
@@ -147 +147 @@
                         select p.Key).Distinct();
 
-      parameters = parameters.Where(x => x != "Seed" && x != "Algorithm Name" && x != parameterToExclude);
+      parameters = parameters.Where(x => x != "Seed" && x != "Algorithm Name");
 
       List<string> ret = new List<string>();
@@ -226 +226 @@
       string parameterName = (string)parameterComboBox.SelectedItem;
 
-      var columnNames = GetColumnNames(parameterName).ToArray();
-      var rowNames = GetRowNames().ToArray();
+      var columnNames = GetColumnNames().ToArray();
+
+      var tmpRowNames = GetRowNames();
+      tmpRowNames.Add("Overall");
+      var rowNames = tmpRowNames.ToArray();
 
       var runs = Content.Where(x => x.Results.ContainsKey(resultName) && x.Visible);
 
-      StringMatrix dt = new StringMatrix(CalculateParameterVariations(), columnNames.Count());
+      StringMatrix dt = new StringMatrix(CalculateParameterVariations() + 1, columnNames.Count());
       dt.RowNames = rowNames;
       dt.ColumnNames = columnNames;
@@ -240 +243 @@
         foreach (var columnName in columnNames) {
           IEnumerable<IRun> curRuns = null;
-          curRuns = runs.Where(x => x.Parameters.ContainsKey(columnName) && ContainsParameterValue(x, parameterName, rowName));
+          if (i + 1 == rowNames.Count()) {
+            //calculate Overall
+            curRuns = runs.Where(x => x.Parameters.ContainsKey(columnName));
+          } else {
+            curRuns = runs.Where(x => x.Parameters.ContainsKey(columnName) && ContainsParameterValue(x, parameterName, rowName));
+          }
 
           var parameterVals = GetParameterVariatons(curRuns, columnName);