Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj (revision 14491)
@@ -73,7 +73,4 @@
..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
-
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
-
@@ -114,4 +111,8 @@
HeuristicLab.DatastreamAnalysis
+
+ {df87c13e-a889-46ff-8153-66dcaa8c5674}
+ HeuristicLab.Problems.DataAnalysis-3.4
+
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs (revision 14491)
@@ -23,5 +23,5 @@
namespace HeuristicLab.DatastreamAnalysis.Views {
- [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.0")]
+ [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14488")]
[PluginFile("HeuristicLab.DatastreamAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
[PluginDependency("HeuristicLab.Collections", "3.3")]
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs (revision 14491)
@@ -54,3 +54,3 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.14.0")]
+[assembly: AssemblyFileVersion("3.4.14.14488")]
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/RegressionEnsembleModelView.cs
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/RegressionEnsembleModelView.cs (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/RegressionEnsembleModelView.cs (revision 14491)
@@ -32,5 +32,5 @@
namespace HeuristicLab.DatastreamAnalysis.Views {
[View("Ensemble Models")]
- [Content(typeof(RegressionEnsembleModel), false)]
+ [Content(typeof(RegressionEnsembleModel), true)]
internal sealed partial class RegressionEnsembleModelView : NamedItemView {
private ModelsView view;
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.sln
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.sln (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.sln (revision 14491)
@@ -8,18 +8,52 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DatastreamAnalysis.Views", "HeuristicLab.DataStreamAnalysis.Views\3.4\HeuristicLab.DatastreamAnalysis.Views.csproj", "{BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis-3.4", "HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj", "{DF87C13E-A889-46FF-8153-66DCAA8C5674}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x64.Build.0 = Debug|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x86.Build.0 = Debug|Any CPU
{8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x64.ActiveCfg = Release|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x64.Build.0 = Release|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x86.ActiveCfg = Release|Any CPU
+ {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x86.Build.0 = Release|Any CPU
{BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x64.Build.0 = Debug|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x86.Build.0 = Debug|Any CPU
{BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x64.ActiveCfg = Release|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x64.Build.0 = Release|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x86.ActiveCfg = Release|Any CPU
+ {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x86.Build.0 = Release|Any CPU
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.ActiveCfg = Debug|x64
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.Build.0 = Debug|x64
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x86.ActiveCfg = Debug|x86
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x86.Build.0 = Debug|x86
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.ActiveCfg = Release|x64
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.Build.0 = Release|x64
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.ActiveCfg = Release|x86
+ {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/HeuristicLab.DatastreamAnalysis.csproj
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/HeuristicLab.DatastreamAnalysis.csproj (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/HeuristicLab.DatastreamAnalysis.csproj (revision 14491)
@@ -82,8 +82,4 @@
False
-
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
- False
-
..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll
@@ -115,4 +111,10 @@
+
+
+ {df87c13e-a889-46ff-8153-66dcaa8c5674}
+ HeuristicLab.Problems.DataAnalysis-3.4
+
+
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Plugin.cs
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Plugin.cs (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Plugin.cs (revision 14491)
@@ -23,5 +23,5 @@
namespace HeuristicLab.DatastreamAnalysis {
- [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.0")]
+ [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.14488")]
[PluginFile("HeuristicLab.DatastreamAnalysis-3.4.dll", PluginFileType.Assembly)]
[PluginDependency("HeuristicLab.Collections", "3.3")]
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Properties/AssemblyInfo.cs
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Properties/AssemblyInfo.cs (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Properties/AssemblyInfo.cs (revision 14491)
@@ -54,3 +54,3 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.14.0")]
+[assembly: AssemblyFileVersion("3.4.14.14488")]
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (revision 14491)
@@ -41,5 +41,5 @@
full
false
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
DEBUG;TRACE
prompt
@@ -99,7 +99,39 @@
-
- ..\..\bin\ALGLIB-3.7.0.dll
- False
+
+ ..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll
@@ -269,60 +301,4 @@
-
-
- {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}
- HeuristicLab.Collections-3.3
- False
-
-
- {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
- HeuristicLab.Common.Resources-3.3
- False
-
-
- {A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}
- HeuristicLab.Common-3.3
- False
-
-
- {C36BD924-A541-4A00-AFA8-41701378DDC5}
- HeuristicLab.Core-3.3
- False
-
-
- {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
- HeuristicLab.Data-3.3
- False
-
-
- {14AB8D24-25BC-400C-A846-4627AA945192}
- HeuristicLab.Optimization-3.3
- False
-
-
- {56F9106A-079F-4C61-92F6-86A84C2D84B7}
- HeuristicLab.Parameters-3.3
- False
-
-
- {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}
- HeuristicLab.Persistence-3.3
- False
-
-
- {94186A6A-5176-4402-AE83-886557B53CCA}
- HeuristicLab.PluginInfrastructure-3.3
- False
-
-
- {3540E29E-4793-49E7-8EE2-FEA7F61C3994}
- HeuristicLab.Problems.Instances-3.3
- False
-
-
- {F4539FB6-4708-40C9-BE64-0A1390AEA197}
- HeuristicLab.Random-3.3
-
-
Index: /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs
===================================================================
--- /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs (revision 14490)
+++ /branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs (revision 14491)
@@ -32,5 +32,6 @@
///
[StorableClass]
- [Item("RegressionEnsembleModel", "A regression model that contains an ensemble of multiple regression models")]
+ [Item("Regression Ensemble Model", "A regression model that contains an ensemble of multiple regression models")]
+ [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 100)]
public sealed class RegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel {
public override IEnumerable VariablesUsedForPrediction {