Changeset 16855


Ignore:
Timestamp:
04/19/19 16:50:40 (4 weeks ago)
Author:
gkronber
Message:

#2847: moved M5 regression into a separate plugin as it depends on HL.DataAnalysis.Algorithms.Glmnet plugin

Location:
trunk
Files:
7 added
11 edited
8 moved

Legend:

Unmodified
Added
Removed
  • trunk/HeuristicLab 3.3.sln

    r16430 r16855  
    462462EndProject
    463463Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3", "HeuristicLab.Algorithms.MOCMAEvolutionStrategy\3.3\HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj", "{0E2E224F-E9B2-41F3-B510-09183EEBA2AF}"
     464EndProject
     465Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis.M5-3.4", "HeuristicLab.Algorithms.DataAnalysis.M5\3.4\HeuristicLab.Algorithms.DataAnalysis.M5-3.4.csproj", "{CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}"
    464466EndProject
    465467Global
     
    22492251    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.ActiveCfg = Release|x86
    22502252    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.Build.0 = Release|x86
     2253    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2254    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2255    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Debug|x64.ActiveCfg = Debug|Any CPU
     2256    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Debug|x64.Build.0 = Debug|Any CPU
     2257    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Debug|x86.ActiveCfg = Debug|Any CPU
     2258    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Debug|x86.Build.0 = Debug|Any CPU
     2259    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2260    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Release|Any CPU.Build.0 = Release|Any CPU
     2261    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Release|x64.ActiveCfg = Release|Any CPU
     2262    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Release|x64.Build.0 = Release|Any CPU
     2263    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Release|x86.ActiveCfg = Release|Any CPU
     2264    {CCC5D1F9-0551-4BF3-8898-E4C44B52E5A6}.Release|x86.Build.0 = Release|Any CPU
    22512265  EndGlobalSection
    22522266  GlobalSection(SolutionProperties) = preSolution
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/LeafModels/ComponentReducedLinearModel.cs

    r16847 r16855  
    2828namespace HeuristicLab.Algorithms.DataAnalysis {
    2929  [StorableType("4E5B8317-648D-4A5A-A3F7-A1A5BEB9AA69")]
    30   public class ComponentReducedLinearModel : RegressionModel {
     30  public sealed class ComponentReducedLinearModel : RegressionModel {
    3131    [Storable]
    3232    private IRegressionModel Model;
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/LeafTypes/ComplexLeaf.cs

    r16847 r16855  
    3232  [StorableType("F34A0ED9-2CF6-4DEE-850D-08790663B66D")]
    3333  [Item("ComplexLeaf", "A leaf type that uses an arbitrary RegressionAlgorithm to create leaf models")]
    34   public class ComplexLeaf : LeafBase {
     34  public sealed class ComplexLeaf : LeafBase {
    3535    public const string RegressionParameterName = "Regression";
    3636    public IValueParameter<IDataAnalysisAlgorithm<IRegressionProblem>> RegressionParameter {
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/LeafTypes/M5Leaf.cs

    r16852 r16855  
    3232  [StorableType("58517042-5318-4087-B098-AC75F0208BA0")]
    3333  [Item("M5Leaf", "A leaf type that uses regularized linear models with feature selection as leaf models.")]
    34   public class M5Leaf : LeafBase {
     34  public sealed class M5Leaf : LeafBase {
    3535    #region Constructors & Cloning
    3636    [StorableConstructor]
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/LeafTypes/M5regLeaf.cs

    r16852 r16855  
    3232  [StorableType("0AED959D-78C3-4927-BDCF-473D0AEE32AA")]
    3333  [Item("M5regLeaf", "A leaf type that uses regularized linear models as leaf models.")]
    34   public class M5regLeaf : LeafBase {
     34  public sealed class M5regLeaf : LeafBase {
    3535    #region Constructors & Cloning
    3636    [StorableConstructor]
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/M5Utilities/RegressionTreeAnalyzer.cs

    r16852 r16855  
    246246
    247247    [StorableType("D5540C63-310B-4D6F-8A3D-6C1A08DE7F80")]
    248     private class TextSymbol : Symbol {
     248    private sealed class TextSymbol : Symbol {
    249249      [StorableConstructor]
    250250      private TextSymbol(StorableConstructorFlag _) : base(_) { }
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/M5Utilities/RegressionTreeParameters.cs

    r16847 r16855  
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    3030  [StorableType("A6293516-C146-469D-B248-31B866A1D94F")]
    31   public class RegressionTreeParameters : Item {
     31  public sealed class RegressionTreeParameters : Item {
    3232    private readonly ISplitter splitter;
    3333    private readonly IPruning pruning;
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/Pruning/NoPruning.cs

    r16847 r16855  
    3030  [StorableType("D67152AA-3533-45D2-B77B-4A0742FB4B92")]
    3131  [Item("NoPruning", "No pruning")]
    32   public class NoPruning : ParameterizedNamedItem, IPruning {
     32  public sealed class NoPruning : ParameterizedNamedItem, IPruning {
    3333    #region Constructors & Cloning
    3434    [StorableConstructor]
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/Splitting/CorrelationSplitter.cs

    r16847 r16855  
    3030  [StorableType("EC3A5009-EE84-4E1A-A537-20F6F1224842")]
    3131  [Item("CorrelationSplitter", "An experimental split selector that uses correlation coefficients")]
    32   public class CorrelationSplitter : SplitterBase {
     32  public sealed class CorrelationSplitter : SplitterBase {
    3333    public const string OrderParameterName = "Order";
    3434    public IFixedValueParameter<DoubleValue> OrderParameter {
  • trunk/HeuristicLab.Algorithms.DataAnalysis.M5/3.4/Splitting/M5Splitter.cs

    r16852 r16855  
    3131  [StorableType("502B1429-7A28-45C1-A60A-93E72CB3AF4A")]
    3232  [Item("M5Splitter", "A split selector that uses the ratio between Variances^(1/Order) to determine good splits.")]
    33   public class M5Splitter : SplitterBase {
     33  public sealed class M5Splitter : SplitterBase {
    3434    public const string OrderParameterName = "Order";
    3535    public IFixedValueParameter<DoubleValue> OrderParameter {
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs.frame

    r16853 r16855  
    3737  [PluginDependency("HeuristicLab.Core", "3.3")]
    3838  [PluginDependency("HeuristicLab.Data", "3.3")]
    39   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
    4039  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
    4140  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
Note: See TracChangeset for help on using the changeset viewer.