Changeset 5579

Timestamp:

03/01/11 14:42:45 (14 years ago)

Author:

mkommend

Message:

#1418: Adapted new ProblemData classes.

Location:

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

Files:

• ClassificationProblem.cs (modified) (2 diffs)
• ClassificationProblemData.cs (modified) (1 diff)
• RegressionProblem.cs (modified) (1 diff)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +28 @@
   [Item("ClassificationProblem", "")]
   [Creatable]
-  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>,
-    IClassificationProblem {
-    private const string ProblemDataParameterName = "ProblemData";
-    public ClassificationProblem(ClassificationProblem original, Cloner cloner)
-      : base(original, cloner) {
-      RegisterEventHandlers();
-    }
+  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem {
     [StorableConstructor]
     public ClassificationProblem(bool deserializing) : base(deserializing) { }
+    public ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) { return new ClassificationProblem(this, cloner); }
+
     public ClassificationProblem()
       : base() {
-      Parameters.Add(new ValueParameter<IClassificationProblemData>(ProblemDataParameterName, "", new ClassificationProblemData()));
-      RegisterEventHandlers();
+      ProblemData = new ClassificationProblemData();
     }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEventHandlers();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new ClassificationProblem(this, cloner);
-    }
-
-    private void RegisterEventHandlers() {
-      ProblemDataParameter.Value.Changed += new EventHandler(Value_Changed);
-    }
-
-    #region event propagation
-    private void Value_Changed(object sender, EventArgs e) {
-      //OnReset();
-    }
-    #endregion
   }
 }

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

@@ -288 +288 @@
     public void SetClassificationPenalty(double correctClassValue, double estimatedClassValue, double penalty) {
       var key = Tuple.Create(correctClassValue, estimatedClassValue);
-      if (misclassificationMatrix[key] != penalty) {
+      if (!misclassificationMatrix.ContainsKey(key) || misclassificationMatrix[key] != penalty) {
         misclassificationMatrix[key] = penalty;
         OnClassificationPenaltyChanged();

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

@@ -28 +28 @@
   [Item("RegressionProblem", "")]
   [Creatable]
-  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>,
-    IRegressionProblem {
-    public RegressionProblem(RegressionProblem original, Cloner cloner)
-      : base(original, cloner) {
-    }
+  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem {
     [StorableConstructor]
     public RegressionProblem(bool deserializing) : base(deserializing) { }
+    public RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) { return new RegressionProblem(this, cloner); }
+
     public RegressionProblem()
       : base() {
-    }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new RegressionProblem(this, cloner);
+      ProblemData = new RegressionProblemData();
     }
   }