Changeset 9587 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Timestamp:

06/05/13 14:18:57 (11 years ago)

Author:

mkommend

Message:

#1730: Integrated excel export for symbolic datanalysis solutions in the trunk.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Files:

• . (modified) (1 prop)
• 3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (3 diffs)
• 3.4/MenuItems (copied) (copied from branches/ExportSymbolicDataAnalysisSolutions/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems)
• 3.4/MenuItems/ExportSymbolicSolutionToExcelMenuItem.cs (modified) (2 diffs)
• 3.4/Plugin.cs.frame (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -97 +97 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="EPPlus-3.1.3, Version=3.1.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\EPPlus-3.1.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -126 +131 @@
       <DependentUpon>MathSymbolicDataAnalysisModelView.cs</DependentUpon>
     </Compile>
+    <Compile Include="MenuItems\ExportSymbolicSolutionToExcelMenuItem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="TextualSymbolicDataAnalysisModelView.cs">
@@ -274 +280 @@
       <Name>HeuristicLab.Optimization-3.3</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
+      <Project>{c664305e-497c-4533-a140-967dedb05c19}</Project>
+      <Name>HeuristicLab.Optimizer-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems/ExportSymbolicSolutionToExcelMenuItem.cs

@@ -28 +28 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimizer;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 using OfficeOpenXml;
 using OfficeOpenXml.Drawing.Chart;
@@ -122 +121 @@
       row += 2;
 
-      var regSolution = solution as SymbolicRegressionSolution;
-      if (regSolution != null) {
-        modelWorksheet.Cells[row, 1].Value = "Estimation Limits Lower";
-        modelWorksheet.Cells[row, 2].Value = regSolution.EstimationLimits.Lower;
-        modelWorksheet.Names.Add("EstimationLimitLower", modelWorksheet.Cells[row, 2]);
-        row++;
-
-        modelWorksheet.Cells[row, 1].Value = "Estimation Limits Upper";
-        modelWorksheet.Cells[row, 2].Value = regSolution.EstimationLimits.Upper;
-        modelWorksheet.Names.Add("EstimationLimitUpper", modelWorksheet.Cells[row, 2]);
-        row += 2;
-      }
+      modelWorksheet.Cells[row, 1].Value = "Estimation Limits Lower";
+      modelWorksheet.Cells[row, 2].Value = solution.Model.LowerEstimationLimit;
+      modelWorksheet.Names.Add("EstimationLimitLower", modelWorksheet.Cells[row, 2]);
+      row++;
+
+      modelWorksheet.Cells[row, 1].Value = "Estimation Limits Upper";
+      modelWorksheet.Cells[row, 2].Value = solution.Model.UpperEstimationLimit;
+      modelWorksheet.Names.Add("EstimationLimitUpper", modelWorksheet.Cells[row, 2]);
+      row += 2;
 
       modelWorksheet.Cells[row, 1].Value = "Trainings Partition Start";

trunk/sources/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")]
@@ -42 +43 @@
   [PluginDependency("HeuristicLab.MathJax", "1.1")]
   [PluginDependency("HeuristicLab.Optimization","3.3")]
+  [PluginDependency("HeuristicLab.Optimizer","3.3")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]