Changeset 13091

Timestamp:

10/29/15 20:39:11 (9 years ago)

Author:

gkronber

Message:

#1998: minor changes

Location:

branches/ClassificationModelComparison

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/ZeroR.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/OneR (deleted)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionComparisonView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/ConfusionMatrixCalculator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/FOneScoreCalculator.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/MatthewsCorrelationCoefficientCalculator.cs (modified) (1 diff)

branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/ZeroR.cs

@@ -31 +31 @@
   /// 0R classification algorithm.
   /// </summary>
-  [Item("ZeroR", "The simplest possible classifier, ZeroR always predicts the majority class.")]
+  [Item("ZeroR Classification", "The simplest possible classifier, ZeroR always predicts the majority class.")]
   [Creatable("Data Analysis")] // TODO
   [StorableClass]

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionComparisonView.cs

@@ -132 +132 @@
       zeroR.Name = "ZeroR Classification Solution";
       newSolutions.Add(zeroR);
-      var oneR = OneRTest.CreateOneRSolution(problemData);
+      var oneR = OneR.CreateOneRSolution(problemData);
       oneR.Name = "OneR Classification Solution";
       newSolutions.Add(oneR);

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/ConfusionMatrixCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
       }
 
-      IEnumerable<double> classValues = originalValues.Distinct();
-      IEnumerable<double> estimatedClassValues = estimatedValues.Distinct();
+      var  classValues = originalValues.Distinct().ToList();
+      var estimatedClassValues = estimatedValues.Distinct().ToList();
 
-      if (!estimatedClassValues.All(x => originalValues.Contains(x))) {
+      if (!estimatedClassValues.All(x => classValues.Contains(x))) {
         errorState = OnlineCalculatorError.InvalidValueAdded;
         return null;
       }
 
-      int classes = classValues.Count();
+      int classes = classValues.Count;
       double[,] confusionMatrix = new double[classes, classes];
 

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/FOneScoreCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
   public class FOneScoreCalculator {
     public static double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
-      if (originalValues.Distinct().Count() != 2) {
+      if (originalValues.Distinct().Skip(2).Any()) {
         throw new ArgumentException("F1 score can only be calculated for binary classification.");
       }
@@ -40 +40 @@
     private static double CalculateFOne(double[,] confusionMatrix) {
       double precision = confusionMatrix[0, 0] / (confusionMatrix[0, 0] + confusionMatrix[0, 1]);
-
       double recall = confusionMatrix[0, 0] / (confusionMatrix[0, 0] + confusionMatrix[1, 0]);
 

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/MatthewsCorrelationCoefficientCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.