Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/23/13 08:08:55 (11 years ago)
Author:
gkronber
Message:

#2102 merged r9973:9975 and r9994 from trunk to stable

Location:
stable
Files:
1 deleted
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Exporters/SymbolicSolutionExcelExporter.cs

    r9975 r9999  
    105105
    106106      modelWorksheet.Cells[row, 1].Value = "Estimation Limits Lower";
    107       modelWorksheet.Cells[row, 2].Value = solution.Model.LowerEstimationLimit;
     107      modelWorksheet.Cells[row, 2].Value = Math.Max(solution.Model.LowerEstimationLimit, -9.99999999999999E+307); // minimal value supported by excel
    108108      modelWorksheet.Names.Add("EstimationLimitLower", modelWorksheet.Cells[row, 2]);
    109       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     109      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    110110      row++;
    111111
    112112      modelWorksheet.Cells[row, 1].Value = "Estimation Limits Upper";
    113       modelWorksheet.Cells[row, 2].Value = solution.Model.UpperEstimationLimit;
     113      modelWorksheet.Cells[row, 2].Value = Math.Min(solution.Model.UpperEstimationLimit, 9.99999999999999E+307);  // maximal value supported by excel
    114114      modelWorksheet.Names.Add("EstimationLimitUpper", modelWorksheet.Cells[row, 2]);
    115       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     115      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    116116      row += 2;
    117117
    … …  
    163163      modelWorksheet.Cells[row, 2].Formula = string.Format("AVERAGE({0})", excelTrainingMSE);
    164164      modelWorksheet.Names.Add("TrainingMSE", modelWorksheet.Cells[row, 2]);
    165       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     165      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    166166      row++;
    167167
    … …  
    169169      modelWorksheet.Cells[row, 2].Formula = string.Format("AVERAGE({0})", excelTestMSE);
    170170      modelWorksheet.Names.Add("TestMSE", modelWorksheet.Cells[row, 2]);
    171       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     171      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    172172      row++;
    173173
    174174      modelWorksheet.Cells[row, 1].Value = "Mean absolute error (training)";
    175175      modelWorksheet.Cells[row, 2].Formula = string.Format("AVERAGE({0})", excelTrainingAbsoluteError);
    176       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     176      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    177177      row++;
    178178
    179179      modelWorksheet.Cells[row, 1].Value = "Mean absolute error (test)";
    180180      modelWorksheet.Cells[row, 2].Formula = string.Format("AVERAGE({0})", excelTestAbsoluteError);
    181       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     181      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    182182      row++;
    183183
    184184      modelWorksheet.Cells[row, 1].Value = "Mean error (training)";
    185185      modelWorksheet.Cells[row, 2].Formula = string.Format("AVERAGE({0})", excelTrainingMeanError);
    186       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     186      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    187187      row++;
    188188
    189189      modelWorksheet.Cells[row, 1].Value = "Mean error (test)";
    190190      modelWorksheet.Cells[row, 2].Formula = string.Format("AVERAGE({0})", excelTestMeanError);
    191       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     191      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    192192      row++;
    193193
    … …  
    204204      modelWorksheet.Cells[row, 1].Value = "Normalized Mean Squared error (training)";
    205205      modelWorksheet.Cells[row, 2].Formula = string.Format("TrainingMSE / VAR({0})", excelTrainingTarget);
    206       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     206      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    207207      row++;
    208208
    209209      modelWorksheet.Cells[row, 1].Value = "Normalized Mean Squared error  (test)";
    210210      modelWorksheet.Cells[row, 2].Formula = string.Format("TestMSE / VAR({0})", excelTestTarget);
    211       modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000";
     211      modelWorksheet.Cells[row, 2].Style.Numberformat.Format = "0.000E+00";
    212212
    213213      modelWorksheet.Cells["A1:B" + row].AutoFitColumns();

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

    r9931 r9999  
    108108    <Reference Include="System.Drawing" />
    109109    <Reference Include="System.Windows.Forms" />
    110     <Reference Include="System.Windows.Forms.DataVisualization" />
    111     <Reference Include="System.Xml.Linq">
    112       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    113     </Reference>
    114     <Reference Include="System.Data.DataSetExtensions">
    115       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    116     </Reference>
    117     <Reference Include="System.Data" />
    118     <Reference Include="System.Xml" />
    119   </ItemGroup>
    120   <ItemGroup>
     110  </ItemGroup>
     111  <ItemGroup>
     112    <Compile Include="Exporters\SymbolicSolutionExcelExporter.cs" />
    121113    <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
    122114      <SubType>UserControl</SubType>
    … …  
    131123      <DependentUpon>MathSymbolicDataAnalysisModelView.cs</DependentUpon>
    132124    </Compile>
    133     <Compile Include="MenuItems\ExportSymbolicSolutionToExcelMenuItem.cs" />
    134125    <Compile Include="Plugin.cs" />
    135126    <Compile Include="TextualSymbolicDataAnalysisModelView.cs">
    … …  
    216207      <Private>False</Private>
    217208    </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    219       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    220       <Name>HeuristicLab.Common.Resources-3.3</Name>
    221       <Private>False</Private>
    222     </ProjectReference>
    223209    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    224210      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    … …  
    266252      <Private>False</Private>
    267253    </ProjectReference>
    268     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    269       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    270       <Name>HeuristicLab.Operators-3.3</Name>
    271       <Private>False</Private>
    272     </ProjectReference>
    273     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    274       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    275       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    276       <Private>False</Private>
    277     </ProjectReference>
    278254    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    279255      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    … …  
    281257      <Private>False</Private>
    282258    </ProjectReference>
    283     <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
    284       <Project>{c664305e-497c-4533-a140-967dedb05c19}</Project>
    285       <Name>HeuristicLab.Optimizer-3.3</Name>
    286     </ProjectReference>
    287     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    288       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    289       <Name>HeuristicLab.Parameters-3.3</Name>
    290       <Private>False</Private>
    291     </ProjectReference>
    292     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    293       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    294       <Name>HeuristicLab.Persistence-3.3</Name>
    295       <Private>False</Private>
    296     </ProjectReference>
    297259    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    298260      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    … …  
    308270      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    309271      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    310       <Private>False</Private>
    311     </ProjectReference>
    312     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    313       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    314       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    315272      <Private>False</Private>
    316273    </ProjectReference>

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame

    r9931 r9999  
    4343  [PluginDependency("HeuristicLab.MathJax", "1.1")]
    4444  [PluginDependency("HeuristicLab.Optimization","3.3")]
    45   [PluginDependency("HeuristicLab.Optimizer","3.3")]
    4645  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4746  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
Note: See TracChangeset for help on using the changeset viewer.