Changeset 17962 for trunk/HeuristicLab.Problems.DataAnalysis
- Timestamp:
- 04/23/21 18:00:27 (4 years ago)
- Location:
- trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs
r17180 r17962 34 34 private const string TrainingAccuracyResultName = "Accuracy (training)"; 35 35 private const string TestAccuracyResultName = "Accuracy (test)"; 36 private const string TrainingNormalizedGiniCoefficientResultName = "Norm alized Gini Coefficient(training)";37 private const string TestNormalizedGiniCoefficientResultName = "Norm alized Gini Coefficient(test)";36 private const string TrainingNormalizedGiniCoefficientResultName = "Norm. Gini coeff. (training)"; 37 private const string TestNormalizedGiniCoefficientResultName = "Norm. Gini coeff. (test)"; 38 38 private const string ClassificationPerformanceMeasuresResultName = "Classification Performance Measures"; 39 39 … … 97 97 if (string.IsNullOrEmpty(Model.TargetVariable)) 98 98 Model.TargetVariable = this.ProblemData.TargetVariable; 99 100 if (!this.ContainsKey(TrainingNormalizedGiniCoefficientResultName)) 99 var newResult = false; 100 if (!this.ContainsKey(TrainingNormalizedGiniCoefficientResultName)) { 101 101 Add(new Result(TrainingNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the model on the training partition.", new DoubleValue())); 102 if (!this.ContainsKey(TestNormalizedGiniCoefficientResultName)) 102 newResult = true; 103 } 104 if (!this.ContainsKey(TestNormalizedGiniCoefficientResultName)) { 103 105 Add(new Result(TestNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the model on the test partition.", new DoubleValue())); 106 newResult = true; 107 } 104 108 if (!this.ContainsKey(ClassificationPerformanceMeasuresResultName)) { 105 109 Add(new Result(ClassificationPerformanceMeasuresResultName, @"Classification performance measures.\n 106 110 In a multiclass classification all misclassifications of the negative class will be treated as true negatives except on positive class estimations.", 107 111 new ClassificationPerformanceMeasuresResultCollection())); 108 CalculateClassificationResults();112 newResult = true; 109 113 } 114 if (newResult) CalculateClassificationResults(); 110 115 } 111 116 -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolutionBase.cs
r17180 r17962 40 40 private const string TrainingRSquaredResultName = "Pearson's R² (training)"; 41 41 private const string TestRSquaredResultName = "Pearson's R² (test)"; 42 private const string TrainingNormalizedGiniCoefficientResultName = "Norm. Gini coeff. (training, discriminant values)"; 43 private const string TestNormalizedGiniCoefficientResultName = "Norm. Gini coeff. (test, discriminant values)"; 44 42 45 43 46 public new IDiscriminantFunctionClassificationModel Model { … … 71 74 private set { ((DoubleValue)this[TestRSquaredResultName].Value).Value = value; } 72 75 } 76 public double TrainingNormalizedGiniCoefficientForDiscriminantValues { 77 get { return ((DoubleValue)this[TrainingNormalizedGiniCoefficientResultName].Value).Value; } 78 protected set { ((DoubleValue)this[TrainingNormalizedGiniCoefficientResultName].Value).Value = value; } 79 } 80 public double TestNormalizedGiniCoefficientForDiscriminantValues { 81 get { return ((DoubleValue)this[TestNormalizedGiniCoefficientResultName].Value).Value; } 82 protected set { ((DoubleValue)this[TestNormalizedGiniCoefficientResultName].Value).Value = value; } 83 } 73 84 #endregion 74 85 … … 85 96 Add(new Result(TrainingRSquaredResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the training partition", new DoubleValue())); 86 97 Add(new Result(TestRSquaredResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the test partition", new DoubleValue())); 98 Add(new Result(TrainingNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the discriminant values produced by the model on the training partition.", new DoubleValue())); 99 Add(new Result(TestNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the discriminant values produced by the model on the test partition.", new DoubleValue())); 87 100 RegisterEventHandler(); 88 101 } … … 90 103 [StorableHook(HookType.AfterDeserialization)] 91 104 private void AfterDeserialization() { 105 #region backwards compatibility 106 if (!ContainsKey(TrainingNormalizedGiniCoefficientResultName)) { 107 Add(new Result(TrainingNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the discriminant values produced by the model on the training partition.", new DoubleValue())); 108 Add(new Result(TestNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the discriminant values produced by the model on the test partition.", new DoubleValue())); 109 double[] estimatedTrainingValues = EstimatedTrainingValues.ToArray(); // cache values 110 double[] originalTrainingValues = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices).ToArray(); 111 double[] estimatedTestValues = EstimatedTestValues.ToArray(); // cache values 112 double[] originalTestValues = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TestIndices).ToArray(); 113 double trainingNormalizedGini = NormalizedGiniCalculator.Calculate(originalTrainingValues, estimatedTrainingValues, out var errorState); 114 if (errorState != OnlineCalculatorError.None) trainingNormalizedGini = double.NaN; 115 double testNormalizedGini = NormalizedGiniCalculator.Calculate(originalTestValues, estimatedTestValues, out errorState); 116 if (errorState != OnlineCalculatorError.None) testNormalizedGini = double.NaN; 117 118 TrainingNormalizedGiniCoefficientForDiscriminantValues = trainingNormalizedGini; 119 TestNormalizedGiniCoefficientForDiscriminantValues = testNormalizedGini; 120 } 121 #endregion 92 122 RegisterEventHandler(); 93 123 } … … 106 136 107 137 double trainingR = OnlinePearsonsRCalculator.Calculate(originalTrainingValues, estimatedTrainingValues, out errorState); 108 TrainingRSquared = errorState == OnlineCalculatorError.None ? trainingR *trainingR : double.NaN;138 TrainingRSquared = errorState == OnlineCalculatorError.None ? trainingR * trainingR : double.NaN; 109 139 double testR = OnlinePearsonsRCalculator.Calculate(originalTestValues, estimatedTestValues, out errorState); 110 TestRSquared = errorState == OnlineCalculatorError.None ? testR *testR : double.NaN;140 TestRSquared = errorState == OnlineCalculatorError.None ? testR * testR : double.NaN; 111 141 112 142 double trainingNormalizedGini = NormalizedGiniCalculator.Calculate(originalTrainingValues, estimatedTrainingValues, out errorState); … … 115 145 if (errorState != OnlineCalculatorError.None) testNormalizedGini = double.NaN; 116 146 117 TrainingNormalizedGiniCoefficient = trainingNormalizedGini;118 TestNormalizedGiniCoefficient = testNormalizedGini;147 TrainingNormalizedGiniCoefficientForDiscriminantValues = trainingNormalizedGini; 148 TestNormalizedGiniCoefficientForDiscriminantValues = testNormalizedGini; 119 149 } 120 150
Note: See TracChangeset
for help on using the changeset viewer.