Ignore:
Timestamp:
04/19/19 13:06:11 (8 months ago)
Author:
gkronber
Message:

#2847: made some minor changes while reviewing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/MetaModels/RegressionRuleModel.cs

    r15830 r16847  
    2828using HeuristicLab.Core;
    2929using HeuristicLab.Optimization;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3130using HeuristicLab.Problems.DataAnalysis;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Algorithms.DataAnalysis {
    34   [StorableClass]
     34  [StorableType("425AF262-A756-4E9A-B76F-4D2480BEA4FD")]
    3535  public class RegressionRuleModel : RegressionModel, IM5Model {
    3636    #region Properties
     
    4949    #region HLConstructors
    5050    [StorableConstructor]
    51     protected RegressionRuleModel(bool deserializing) : base(deserializing) { }
     51    protected RegressionRuleModel(StorableConstructorFlag _) : base(_) { }
    5252    protected RegressionRuleModel(RegressionRuleModel original, Cloner cloner) : base(original, cloner) {
    5353      if (original.SplitAttributes != null) SplitAttributes = original.SplitAttributes.ToArray();
     
    8888      //build tree and select node with maximum coverage
    8989      var tree = RegressionNodeTreeModel.CreateTreeModel(regressionTreeParams.TargetVariable, regressionTreeParams);
    90       tree.BuildModelless(trainingRows, pruningRows, statescope, results, cancellationToken);
     90      tree.BuildModel(trainingRows, pruningRows, statescope, results, cancellationToken);
    9191      var nodeModel = tree.Root.EnumerateNodes().Where(x => x.IsLeaf).MaxItems(x => x.NumSamples).First();
    9292
     
    9595      var reops = new List<Comparison>();
    9696
    97       //extract Splits
     97      //extract splits
    9898      for (var temp = nodeModel; temp.Parent != null; temp = temp.Parent) {
    9999        satts.Add(temp.Parent.SplitAttribute);
     
    137137    }
    138138
    139     [StorableClass]
     139    [StorableType("7302AA30-9F58-42F3-BF6A-ECF1536508AB")]
    140140    private sealed class ConfidenceRegressionRuleModel : RegressionRuleModel, IConfidenceRegressionModel {
    141141      #region HLConstructors
    142142      [StorableConstructor]
    143       private ConfidenceRegressionRuleModel(bool deserializing) : base(deserializing) { }
     143      private ConfidenceRegressionRuleModel(StorableConstructorFlag _) : base(_) { }
    144144      private ConfidenceRegressionRuleModel(ConfidenceRegressionRuleModel original, Cloner cloner) : base(original, cloner) { }
    145145      public ConfidenceRegressionRuleModel(string targetAttr) : base(targetAttr) { }
     
    159159  }
    160160
     161  [StorableType("152DECE4-2692-4D53-B290-974806ADCD72")]
    161162  internal enum Comparison {
    162163    LessEqual,
Note: See TracChangeset for help on using the changeset viewer.