Changeset 10364 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Timestamp:

01/22/14 11:27:17 (11 years ago)

Author:

mkommend

Message:

#1837: Merged trunk changes.

Location:

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (2 diffs)
• Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -192 +192 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Exporters\SymbolicSolutionExcelExporter.cs" />
     <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
       <SubType>UserControl</SubType>
@@ -204 +205 @@
       <DependentUpon>MathSymbolicDataAnalysisModelView.cs</DependentUpon>
     </Compile>
-    <Compile Include="MenuItems\ExportSymbolicSolutionToExcelMenuItem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="SlidingWindowDataView.cs">

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
-  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Views","Provides views for symbolic data analysis problem classes.", "3.4.4.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Views","Provides views for symbolic data analysis problem classes.", "3.4.5.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginFile("displayModelFrame.html", PluginFileType.Data)]
@@ -43 +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")]

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Properties/AssemblyInfo.cs.frame

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.4.5.$WCREV$")]