Changeset 14491


Ignore:
Timestamp:
12/14/16 18:06:56 (4 years ago)
Author:
jzenisek
Message:

#2719 adapted RegressionEnsembleModel in order that it is creatable from now on

Location:
branches/HeuristicLab.DatastreamAnalysis
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj

    r14488 r14491  
    7373      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    7474    </Reference>
    75     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    76       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    77     </Reference>
    7875    <Reference Include="System" />
    7976    <Reference Include="System.Core" />
     
    114111      <Name>HeuristicLab.DatastreamAnalysis</Name>
    115112    </ProjectReference>
     113    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     114      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
     115      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     116    </ProjectReference>
    116117  </ItemGroup>
    117118  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs

    r14488 r14491  
    2323
    2424namespace HeuristicLab.DatastreamAnalysis.Views {
    25   [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.0")]
     25  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14488")]
    2626  [PluginFile("HeuristicLab.DatastreamAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs

    r14488 r14491  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.4.0.0")]
    56 [assembly: AssemblyFileVersion("3.4.14.0")]
     56[assembly: AssemblyFileVersion("3.4.14.14488")]
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/RegressionEnsembleModelView.cs

    r14488 r14491  
    3232namespace HeuristicLab.DatastreamAnalysis.Views {
    3333  [View("Ensemble Models")]
    34   [Content(typeof(RegressionEnsembleModel), false)]
     34  [Content(typeof(RegressionEnsembleModel), true)]
    3535  internal sealed partial class RegressionEnsembleModelView : NamedItemView {
    3636    private ModelsView view;
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.sln

    r14488 r14491  
    88Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DatastreamAnalysis.Views", "HeuristicLab.DataStreamAnalysis.Views\3.4\HeuristicLab.DatastreamAnalysis.Views.csproj", "{BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}"
    99EndProject
     10Project("{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}"
     11EndProject
    1012Global
    1113  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1214    Debug|Any CPU = Debug|Any CPU
     15    Debug|x64 = Debug|x64
     16    Debug|x86 = Debug|x86
    1317    Release|Any CPU = Release|Any CPU
     18    Release|x64 = Release|x64
     19    Release|x86 = Release|x86
    1420  EndGlobalSection
    1521  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    1622    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1723    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|Any CPU.Build.0 = Debug|Any CPU
     24    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x64.ActiveCfg = Debug|Any CPU
     25    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x64.Build.0 = Debug|Any CPU
     26    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x86.ActiveCfg = Debug|Any CPU
     27    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Debug|x86.Build.0 = Debug|Any CPU
    1828    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1929    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|Any CPU.Build.0 = Release|Any CPU
     30    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x64.ActiveCfg = Release|Any CPU
     31    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x64.Build.0 = Release|Any CPU
     32    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x86.ActiveCfg = Release|Any CPU
     33    {8BA00CA6-71F6-415B-B5B7-DA3D64318750}.Release|x86.Build.0 = Release|Any CPU
    2034    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    2135    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
     36    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x64.ActiveCfg = Debug|Any CPU
     37    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x64.Build.0 = Debug|Any CPU
     38    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x86.ActiveCfg = Debug|Any CPU
     39    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Debug|x86.Build.0 = Debug|Any CPU
    2240    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2341    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|Any CPU.Build.0 = Release|Any CPU
     42    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x64.ActiveCfg = Release|Any CPU
     43    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x64.Build.0 = Release|Any CPU
     44    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x86.ActiveCfg = Release|Any CPU
     45    {BEA131E1-BD7C-41E8-B372-ED0EB110F7DF}.Release|x86.Build.0 = Release|Any CPU
     46    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     47    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.Build.0 = Debug|Any CPU
     48    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.ActiveCfg = Debug|x64
     49    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.Build.0 = Debug|x64
     50    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x86.ActiveCfg = Debug|x86
     51    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x86.Build.0 = Debug|x86
     52    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.ActiveCfg = Release|Any CPU
     53    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.Build.0 = Release|Any CPU
     54    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.ActiveCfg = Release|x64
     55    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.Build.0 = Release|x64
     56    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.ActiveCfg = Release|x86
     57    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.Build.0 = Release|x86
    2458  EndGlobalSection
    2559  GlobalSection(SolutionProperties) = preSolution
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/HeuristicLab.DatastreamAnalysis.csproj

    r14488 r14491  
    8282      <Private>False</Private>
    8383    </Reference>
    84     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    85       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    86       <Private>False</Private>
    87     </Reference>
    8884    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
    8985      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     
    115111    <None Include="Properties\AssemblyInfo.cs.frame" />
    116112  </ItemGroup>
     113  <ItemGroup>
     114    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     115      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
     116      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     117    </ProjectReference>
     118  </ItemGroup>
    117119  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    118120  <PropertyGroup>
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Plugin.cs

    r14488 r14491  
    2323
    2424namespace HeuristicLab.DatastreamAnalysis {
    25   [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.0")]
     25  [Plugin("HeuristicLab.DatastreamAnalysis", "3.4.14.14488")]
    2626  [PluginFile("HeuristicLab.DatastreamAnalysis-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis/3.4/Properties/AssemblyInfo.cs

    r14488 r14491  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.4.0.0")]
    56 [assembly: AssemblyFileVersion("3.4.14.0")]
     56[assembly: AssemblyFileVersion("3.4.14.14488")]
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r14099 r14491  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103       <Private>False</Private>
     101    <Reference Include="ALGLIB-3.7.0">
     102      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Collections-3.3">
     105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Common-3.3">
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Common.Resources-3.3">
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Core-3.3">
     114      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Data-3.3">
     117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Optimization-3.3">
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Parameters-3.3">
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Persistence-3.3">
     126      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     127    </Reference>
     128    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     129      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     133    </Reference>
     134    <Reference Include="HeuristicLab.Random-3.3">
     135      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    104136    </Reference>
    105137    <Reference Include="System" />
     
    269301    </BootstrapperPackage>
    270302  </ItemGroup>
    271   <ItemGroup>
    272     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    273       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    274       <Name>HeuristicLab.Collections-3.3</Name>
    275       <Private>False</Private>
    276     </ProjectReference>
    277     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    278       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    279       <Name>HeuristicLab.Common.Resources-3.3</Name>
    280       <Private>False</Private>
    281     </ProjectReference>
    282     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    283       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    284       <Name>HeuristicLab.Common-3.3</Name>
    285       <Private>False</Private>
    286     </ProjectReference>
    287     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    288       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    289       <Name>HeuristicLab.Core-3.3</Name>
    290       <Private>False</Private>
    291     </ProjectReference>
    292     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    293       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    294       <Name>HeuristicLab.Data-3.3</Name>
    295       <Private>False</Private>
    296     </ProjectReference>
    297     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    298       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    299       <Name>HeuristicLab.Optimization-3.3</Name>
    300       <Private>False</Private>
    301     </ProjectReference>
    302     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    303       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    304       <Name>HeuristicLab.Parameters-3.3</Name>
    305       <Private>False</Private>
    306     </ProjectReference>
    307     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    308       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    309       <Name>HeuristicLab.Persistence-3.3</Name>
    310       <Private>False</Private>
    311     </ProjectReference>
    312     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    313       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    314       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    315       <Private>False</Private>
    316     </ProjectReference>
    317     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    318       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    319       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    320       <Private>False</Private>
    321     </ProjectReference>
    322     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    323       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    324       <Name>HeuristicLab.Random-3.3</Name>
    325     </ProjectReference>
    326   </ItemGroup>
    327303  <ItemGroup />
    328304  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs

    r14185 r14491  
    3232  /// </summary>
    3333  [StorableClass]
    34   [Item("RegressionEnsembleModel", "A regression model that contains an ensemble of multiple regression models")]
     34  [Item("Regression Ensemble Model", "A regression model that contains an ensemble of multiple regression models")]
     35  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 100)]
    3536  public sealed class RegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel {
    3637    public override IEnumerable<string> VariablesUsedForPrediction {
Note: See TracChangeset for help on using the changeset viewer.