Changeset 18027 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs

Timestamp:

07/20/21 18:13:55 (3 years ago)

Author:

dpiringe

Message:

#3026

• merged trunk into branch

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs

@@ -34 +34 @@
     private const string TrainingAccuracyResultName = "Accuracy (training)";
     private const string TestAccuracyResultName = "Accuracy (test)";
-    private const string TrainingNormalizedGiniCoefficientResultName = "Normalized Gini Coefficient (training)";
-    private const string TestNormalizedGiniCoefficientResultName = "Normalized Gini Coefficient (test)";
+    private const string TrainingNormalizedGiniCoefficientResultName = "Norm. Gini coeff. (training)";
+    private const string TestNormalizedGiniCoefficientResultName = "Norm. Gini coeff. (test)";
     private const string ClassificationPerformanceMeasuresResultName = "Classification Performance Measures";
 
@@ -97 +97 @@
       if (string.IsNullOrEmpty(Model.TargetVariable))
         Model.TargetVariable = this.ProblemData.TargetVariable;
-
-      if (!this.ContainsKey(TrainingNormalizedGiniCoefficientResultName))
+      var newResult = false;
+      if (!this.ContainsKey(TrainingNormalizedGiniCoefficientResultName)) {
         Add(new Result(TrainingNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the model on the training partition.", new DoubleValue()));
-      if (!this.ContainsKey(TestNormalizedGiniCoefficientResultName))
+        newResult = true;
+      }
+      if (!this.ContainsKey(TestNormalizedGiniCoefficientResultName)) {
         Add(new Result(TestNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the model on the test partition.", new DoubleValue()));
+        newResult = true;
+      }
       if (!this.ContainsKey(ClassificationPerformanceMeasuresResultName)) {
         Add(new Result(ClassificationPerformanceMeasuresResultName, @"Classification performance measures.\n
                               In a multiclass classification all misclassifications of the negative class will be treated as true negatives except on positive class estimations.",
                               new ClassificationPerformanceMeasuresResultCollection()));
-        CalculateClassificationResults();
+        newResult = true;
       }
+      if (newResult) CalculateClassificationResults();
     }