Changeset 5717 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DiscriminantFunctionClassificationSolution.cs

Timestamp:

03/16/11 16:34:31 (13 years ago)

Author:

gkronber

Message:

#1418 Implemented interactive simplifier views for symbolic classification and regression.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DiscriminantFunctionClassificationSolution.cs (modified) (3 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DiscriminantFunctionClassificationSolution.cs

@@ -38 +38 @@
   [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
   public class DiscriminantFunctionClassificationSolution : ClassificationSolution, IDiscriminantFunctionClassificationSolution {
+    public new IDiscriminantFunctionClassificationModel Model {
+      get { return (IDiscriminantFunctionClassificationModel)base.Model; }
+      protected set { base.Model = value; }
+    }
+
     [StorableConstructor]
     protected DiscriminantFunctionClassificationSolution(bool deserializing) : base(deserializing) { }
@@ -48 +53 @@
     public DiscriminantFunctionClassificationSolution(IDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
       : base(model, problemData) {
-      Model.ThresholdsChanged += new EventHandler(Model_ThresholdsChanged);
-    }
-
-    #region IDiscriminantFunctionClassificationSolution Members
-
-    public new IDiscriminantFunctionClassificationModel Model {
-      get { return (IDiscriminantFunctionClassificationModel)base.Model; }
     }
 
@@ -72 +70 @@
       return Model.GetEstimatedValues(ProblemData.Dataset, rows);
     }
-
-    public IEnumerable<double> Thresholds {
-      get {
-        return Model.Thresholds;
-      }
-      set { Model.Thresholds = new List<double>(value); }
-    }
-
-    public event EventHandler ThresholdsChanged;
-
-    private void Model_ThresholdsChanged(object sender, EventArgs e) {
-      OnThresholdsChanged(e);
-    }
-
-    protected virtual void OnThresholdsChanged(EventArgs e) {
-      var listener = ThresholdsChanged;
-      if (listener != null) listener(this, e);
-    }
-    #endregion
   }
 }