Ignore:
Timestamp:
09/03/13 15:46:01 (9 years ago)
Author:
ascheibe
Message:

#1730 merged r9587,r9590, r9600, r9607, r9626, r9658, r9659, r9699, r9906 into stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationModel.cs

    r9456 r9931  
    2323namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    2424  public interface ISymbolicClassificationModel : IClassificationModel, ISymbolicDataAnalysisModel {
    25     double LowerEstimationLimit { get; }
    26     double UpperEstimationLimit { get; }
    2725    void RecalculateModelParameters(IClassificationProblemData problemData, IEnumerable<int> rows);
    2826    new ISymbolicClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData);
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationModel.cs

    r9456 r9931  
    3232  [StorableClass]
    3333  [Item(Name = "SymbolicClassificationModel", Description = "Represents a symbolic classification model.")]
    34   public abstract class
    35     SymbolicClassificationModel : SymbolicDataAnalysisModel, ISymbolicClassificationModel {
    36     [Storable]
    37     private double lowerEstimationLimit;
    38     public double LowerEstimationLimit { get { return lowerEstimationLimit; } }
    39     [Storable]
    40     private double upperEstimationLimit;
    41     public double UpperEstimationLimit { get { return upperEstimationLimit; } }
     34  public abstract class SymbolicClassificationModel : SymbolicDataAnalysisModel, ISymbolicClassificationModel {
    4235
    4336    [StorableConstructor]
    4437    protected SymbolicClassificationModel(bool deserializing) : base(deserializing) { }
    45     protected SymbolicClassificationModel(SymbolicClassificationModel original, Cloner cloner)
    46       : base(original, cloner) {
    47       lowerEstimationLimit = original.lowerEstimationLimit;
    48       upperEstimationLimit = original.upperEstimationLimit;
    49     }
    50     protected SymbolicClassificationModel(ISymbolicExpressionTree tree, ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, double lowerEstimationLimit = double.MinValue, double upperEstimationLimit = double.MaxValue)
    51       : base(tree, interpreter) {
    52       this.lowerEstimationLimit = lowerEstimationLimit;
    53       this.upperEstimationLimit = upperEstimationLimit;
    54     }
     38    protected SymbolicClassificationModel(SymbolicClassificationModel original, Cloner cloner) : base(original, cloner) { }
     39    protected SymbolicClassificationModel(ISymbolicExpressionTree tree, ISymbolicDataAnalysisExpressionTreeInterpreter interpreter,
     40      double lowerEstimationLimit = double.MinValue, double upperEstimationLimit = double.MaxValue)
     41      : base(tree, interpreter, lowerEstimationLimit, upperEstimationLimit) { }
    5542
    5643    public abstract IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows);
Note: See TracChangeset for help on using the changeset viewer.