Changeset 13941 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs
- Timestamp:
- 06/28/16 13:33:17 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs
r13921 r13941 33 33 [StorableClass] 34 34 [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")] 35 public class DiscriminantFunctionClassificationModel : NamedItem, IDiscriminantFunctionClassificationModel {36 public IEnumerable<string> VariablesUsedForPrediction {35 public class DiscriminantFunctionClassificationModel : ClassificationModel, IDiscriminantFunctionClassificationModel { 36 public override IEnumerable<string> VariablesUsedForPrediction { 37 37 get { return model.VariablesUsedForPrediction; } 38 38 } 39 40 public string TargetVariable { get { return model.TargetVariable; } }41 39 42 40 [Storable] … … 79 77 80 78 public DiscriminantFunctionClassificationModel(IRegressionModel model, IDiscriminantFunctionThresholdCalculator thresholdCalculator) 81 : base( ) {79 : base(model.TargetVariable) { 82 80 this.name = ItemName; 83 81 this.description = ItemDescription; 82 84 83 this.model = model; 85 84 this.classValues = new double[0]; … … 121 120 } 122 121 123 public IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) {122 public override IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) { 124 123 if (!Thresholds.Any() && !ClassValues.Any()) throw new ArgumentException("No thresholds and class values were set for the current classification model."); 125 124 foreach (var x in GetEstimatedValues(dataset, rows)) { … … 141 140 #endregion 142 141 143 public virtual IDiscriminantFunctionClassificationSolution CreateDiscriminantFunctionClassificationSolution(IClassificationProblemData problemData) { 142 public override IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) { 143 return CreateDiscriminantFunctionClassificationSolution(problemData); 144 } 145 public virtual IDiscriminantFunctionClassificationSolution CreateDiscriminantFunctionClassificationSolution( 146 IClassificationProblemData problemData) { 144 147 return new DiscriminantFunctionClassificationSolution(this, new ClassificationProblemData(problemData)); 145 }146 147 public virtual IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) {148 return CreateDiscriminantFunctionClassificationSolution(problemData);149 148 } 150 149 }
Note: See TracChangeset
for help on using the changeset viewer.