Changeset 11766 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

01/15/15 13:48:00 (10 years ago)

Author:

mkommend

Message:

#2278: Renamed positive class parameter to satisfy the parameter visibility unit test and fixed cloning of classification performance measures.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification

Files:

• ClassificationPerformanceMeasures.cs (modified) (2 diffs)
• ClassificationProblemData.cs (modified) (10 diffs)
• ClassificationSolutionBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationPerformanceMeasures.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
@@ -51 +52 @@
     protected ClassificationPerformanceMeasuresResultCollection(bool deserializing)
       : base(deserializing) {
+    }
+
+    protected ClassificationPerformanceMeasuresResultCollection(ClassificationPerformanceMeasuresResultCollection original, Cloner cloner)
+      : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ClassificationPerformanceMeasuresResultCollection(this, cloner);
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

@@ -36 +36 @@
     protected const string ClassNamesParameterName = "ClassNames";
     protected const string ClassificationPenaltiesParameterName = "ClassificationPenalties";
-    protected const string PositiveClassNameParameterName = "PositiveClass";
+    protected const string PositiveClassParameterName = "PositiveClass";
     protected const int MaximumNumberOfClasses = 100;
     protected const int InspectedRowsToDetermineTargets = 2000;
@@ -214 +214 @@
       get { return (IFixedValueParameter<StringMatrix>)Parameters[ClassNamesParameterName]; }
     }
-    public IConstrainedValueParameter<StringValue> PositiveClassNameParameter {
-      get { return (IConstrainedValueParameter<StringValue>)Parameters[PositiveClassNameParameterName]; }
+    public IConstrainedValueParameter<StringValue> PositiveClassParameter {
+      get { return (IConstrainedValueParameter<StringValue>)Parameters[PositiveClassParameterName]; }
     }
     public IFixedValueParameter<DoubleMatrix> ClassificationPenaltiesParameter {
@@ -267 +267 @@
     }
 
-    public string PositiveClassName {
-      get { return PositiveClassNameParameter.Value.Value; }
+    public string PositiveClass {
+      get { return PositiveClassParameter.Value.Value; }
       set {
-        var matchingValue = PositiveClassNameParameter.ValidValues.SingleOrDefault(x => x.Value == value);
+        var matchingValue = PositiveClassParameter.ValidValues.SingleOrDefault(x => x.Value == value);
         if (matchingValue == null) throw new ArgumentException(string.Format("{0} cannot be set as positive class.", value));
-        PositiveClassNameParameter.Value = matchingValue;
+        PositiveClassParameter.Value = matchingValue;
       }
     }
@@ -285 +285 @@
       // BackwardsCompatibility3.4
       #region Backwards compatible code, remove with 3.5
-      if (!Parameters.ContainsKey(PositiveClassNameParameterName)) {
+      if (!Parameters.ContainsKey(PositiveClassParameterName)) {
         var validValues = new ItemSet<StringValue>(ClassNames.Select(s => new StringValue(s).AsReadOnly()));
-        Parameters.Add(new ConstrainedValueParameter<StringValue>(PositiveClassNameParameterName,
+        Parameters.Add(new ConstrainedValueParameter<StringValue>(PositiveClassParameterName,
           "The positive class which is used for quality measure calculation (e.g., specifity, sensitivity,...)", validValues, validValues.First()));
       }
@@ -329 +329 @@
       Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(validTargetVariableValues), target));
       Parameters.Add(new FixedValueParameter<StringMatrix>(ClassNamesParameterName, ""));
-      Parameters.Add(new ConstrainedValueParameter<StringValue>(PositiveClassNameParameterName, "The positive class which is used for quality measure calculation (e.g., specifity, sensitivity,...)"));
+      Parameters.Add(new ConstrainedValueParameter<StringValue>(PositiveClassParameterName, "The positive class which is used for quality measure calculation (e.g., specifity, sensitivity,...)"));
       Parameters.Add(new FixedValueParameter<DoubleMatrix>(ClassificationPenaltiesParameterName, ""));
 
@@ -363 +363 @@
       ClassNamesParameter.Value.RowNames = ClassValues.Select(s => "ClassValue: " + s);
 
-      PositiveClassNameParameter.ValidValues.Clear();
+      PositiveClassParameter.ValidValues.Clear();
       foreach (var className in ClassNames) {
-        PositiveClassNameParameter.ValidValues.Add(new StringValue(className).AsReadOnly());
+        PositiveClassParameter.ValidValues.Add(new StringValue(className).AsReadOnly());
       }
 
@@ -439 +439 @@
     }
     private void Parameter_ValueChanged(object sender, EventArgs e) {
-      var oldPositiveClass = PositiveClassName;
+      var oldPositiveClass = PositiveClass;
       var oldClassNames = classNamesCache;
       var index = oldClassNames.IndexOf(oldPositiveClass);
@@ -447 +447 @@
       ClassificationPenaltiesParameter.Value.ColumnNames = ClassNames.Select(name => "Estimated " + name);
 
-      PositiveClassNameParameter.ValidValues.Clear();
+      PositiveClassParameter.ValidValues.Clear();
       foreach (var className in ClassNames) {
-        PositiveClassNameParameter.ValidValues.Add(new StringValue(className).AsReadOnly());
-      }
-      PositiveClassNameParameter.Value = PositiveClassNameParameter.ValidValues.ElementAt(index);
+        PositiveClassParameter.ValidValues.Add(new StringValue(className).AsReadOnly());
+      }
+      PositiveClassParameter.Value = PositiveClassParameter.ValidValues.ElementAt(index);
 
       OnChanged();
@@ -477 +477 @@
       }
 
-      var newPositivieClassName = classificationProblemData.PositiveClassName;
-      if (newPositivieClassName != PositiveClassName) {
+      var newPositivieClassName = classificationProblemData.PositiveClass;
+      if (newPositivieClassName != PositiveClass) {
         errorMessage = errorMessage + string.Format("The positive class differs in the provided classification problem data.");
         returnValue = false;
@@ -497 +497 @@
         ClassNamesParameter.Value[i, 0] = classificationProblemData.ClassNames.ElementAt(i);
 
-      PositiveClassName = classificationProblemData.PositiveClassName;
+      PositiveClass = classificationProblemData.PositiveClass;
 
       for (int i = 0; i < Classes; i++) {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs

@@ -95 +95 @@
                               In a multiclass classification all misclassifications of the negative class will be treated as true negatives except on positive class estimations.",
                               new ClassificationPerformanceMeasuresResultCollection()));
-        RecalculateResults();
+        CalculateClassificationResults();
       }
     }
@@ -106 +106 @@
       double[] originalTestClassValues = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TestIndices).ToArray();
 
-      var positiveClassName = ProblemData.PositiveClassName;
+      var positiveClassName = ProblemData.PositiveClass;
       double positiveClassValue = ProblemData.GetClassValue(positiveClassName);
       ClassificationPerformanceMeasuresCalculator trainingPerformanceCalculator = new ClassificationPerformanceMeasuresCalculator(positiveClassName, positiveClassValue);