Changeset 9585

Timestamp:

06/05/13 11:40:58 (11 years ago)

Author:

mkommend

Message:

#1730: Added necessary plugin dependency and improved error handling.

Location:

branches/ExportSymbolicDataAnalysisSolutions

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems/ExportSymbolicSolutionToExcelMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs (modified) (2 diffs)

branches/ExportSymbolicDataAnalysisSolutions/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems/ExportSymbolicSolutionToExcelMenuItem.cs

@@ -87 +87 @@
           WriteInputSheet(inputsWorksheet, datasetWorksheet, formulaParts.Skip(2), solution.ProblemData.Dataset);
 
-          ExcelWorksheet estimatedWorksheet = package.Workbook.Worksheets.Add("Estimated Values");
           if (solution is IRegressionSolution) {
+            ExcelWorksheet estimatedWorksheet = package.Workbook.Worksheets.Add("Estimated Values");
             WriteEstimatedWorksheet(estimatedWorksheet, datasetWorksheet, formulaParts, solution as IRegressionSolution);
+
+            ExcelWorksheet chartsWorksheet = package.Workbook.Worksheets.Add("Charts");
+            AddCharts(chartsWorksheet);
           }
-
-          ExcelWorksheet chartsWorksheet = package.Workbook.Worksheets.Add("Charts");
-          AddCharts(chartsWorksheet);
-
           package.Workbook.Properties.Title = "Excel Export";
           package.Workbook.Properties.Author = "HEAL";
@@ -309 +308 @@
 
       estimatedWorksheet.Cells["D2:D" + (rows + 1)].Formula = "ABS(B2 - C2)";
-      estimatedWorksheet.Cells["E2:E" + (rows + 1)].Formula = "ABS(D2 / B2)";
+      estimatedWorksheet.Cells["E2:E" + (rows + 1)].Formula = "D2 / B2";
       estimatedWorksheet.Cells["F2:F" + (rows + 1)].Formula = "C2 - B2";
       estimatedWorksheet.Cells["G2:G" + (rows + 1)].Formula = "POWER(F2, 2)";

branches/ExportSymbolicDataAnalysisSolutions/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame

@@ -36 +36 @@
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Data.Views", "3.3")]
+  [PluginDependency("HeuristicLab.EPPlus", "3.1")]
   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views", "3.4")]

branches/ExportSymbolicDataAnalysisSolutions/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs

@@ -167 +167 @@
         stringBuilder.Append(")");
 
-      } else if (symbol is HeuristicLab.Problems.DataAnalysis.Symbolic.Variable) {
+      } else if (symbol is Variable) {
         VariableTreeNode variableTreeNode = node as VariableTreeNode;
         stringBuilder.Append(variableTreeNode.Weight.ToString(CultureInfo.InvariantCulture));
@@ -185 +185 @@
         stringBuilder.Append(",0))");
       } else {
-        stringBuilder.Append("ERROR");
+        throw new NotImplementedException("Excel export of " + node.Symbol + " is not implemented.");
       }
       return stringBuilder.ToString();