Changeset 5736 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs

Timestamp:

03/17/11 15:14:45 (13 years ago)

Author:

gkronber

Message:

#1418 implemented linear scaling for classification solutions, fixed bugs interactive simplifier view for classification solutions.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs (modified) (3 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs

@@ -40 +40 @@
     [Storable]
     private IRegressionModel model;
+
     [Storable]
     private double[] classValues;
-    // class values are not necessarily sorted in ascending order
     public IEnumerable<double> ClassValues {
       get { return (double[])classValues.Clone(); }
-      set {
-        if (value == null) throw new ArgumentException();
-        double[] newValue = value.ToArray();
-        if (newValue.Length != classValues.Length) throw new ArgumentException();
-        classValues = newValue;
-      }
+      private set { classValues = value.ToArray(); }
     }
+
     [Storable]
     private double[] thresholds;
     public IEnumerable<double> Thresholds {
       get { return (IEnumerable<double>)thresholds.Clone(); }
-      set {
-        thresholds = value.ToArray();
-        OnThresholdsChanged(EventArgs.Empty);
-      }
+      private set { thresholds = value.ToArray(); }
     }
 
@@ -71 +64 @@
       thresholds = (double[])original.thresholds.Clone();
     }
-    public DiscriminantFunctionClassificationModel(IRegressionModel model, IEnumerable<double> classValues, IEnumerable<double> thresholds)
+
+    public DiscriminantFunctionClassificationModel(IRegressionModel model)
       : base() {
       this.name = ItemName;
       this.description = ItemDescription;
       this.model = model;
-      this.classValues = classValues.ToArray();
-      this.thresholds = thresholds.ToArray();
+      this.classValues = new double[] { 0.0 };
+      this.thresholds = new double[] { double.NegativeInfinity };
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new DiscriminantFunctionClassificationModel(this, cloner);
+    }
+
+    public void SetThresholdsAndClassValues(IEnumerable<double> thresholds, IEnumerable<double> classValues) {
+      var classValuesArr = classValues.ToArray();
+      var thresholdsArr = thresholds.ToArray();
+      if (thresholdsArr.Length != classValuesArr.Length) throw new ArgumentException();
+
+      this.classValues = classValuesArr;
+      this.thresholds = thresholdsArr;
+      OnThresholdsChanged(EventArgs.Empty);
     }
 
@@ -96 +100 @@
           else break;
         }
-        yield return classValues.ElementAt(classIndex);
+        yield return classValues.ElementAt(classIndex - 1);
       }
     }