Changeset 5577 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

03/01/11 12:04:53 (14 years ago)

Author:

mkommend

Message:

#1418: worked on data analysis problem representation.

Location:

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

Files:

• ClassificationProblem.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/RegressionProblem.cs) (3 diffs)
• DataAnalysisProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Interfaces/Classification/IClassificationProblem.cs (modified) (1 diff)
• Interfaces/IDataAnalysisProblem.cs (modified) (2 diffs)
• Interfaces/Regression/IRegressionProblem.cs (modified) (1 diff)
• RegressionProblem.cs (modified) (4 diffs)

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableClass]
-  [Item("RegressionProblem", "")]
+  [Item("ClassificationProblem", "")]
   [Creatable]
-  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>,
-    IRegressionProblem {
+  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>,
+    IClassificationProblem {
     private const string ProblemDataParameterName = "ProblemData";
-    #region properties
-    public new IDataAnalysisEvaluator<IRegressionProblemData> Evaluator {
-      get { throw new NotImplementedException(); }
-    }
-
-    public new IRegressionSolutionCreator SolutionCreator {
-      get { throw new NotImplementedException(); }
-    }
-    IDataAnalysisSolutionCreator<IRegressionProblemData> IDataAnalysisProblem<IRegressionProblemData>.SolutionCreator {
-      get { throw new NotImplementedException(); }
-    }
-    #endregion
-
-    public RegressionProblem(RegressionProblem original, Cloner cloner)
+    public ClassificationProblem(ClassificationProblem original, Cloner cloner)
       : base(original, cloner) {
       RegisterEventHandlers();
     }
     [StorableConstructor]
-    public RegressionProblem(bool deserializing) : base(deserializing) { }
-    public RegressionProblem()
+    public ClassificationProblem(bool deserializing) : base(deserializing) { }
+    public ClassificationProblem()
       : base() {
-      Parameters.Add(new ValueParameter<IRegressionProblemData>(ProblemDataParameterName, "", new RegressionProblemData()));
+      Parameters.Add(new ValueParameter<IClassificationProblemData>(ProblemDataParameterName, "", new ClassificationProblemData()));
       RegisterEventHandlers();
     }
@@ -68 +51 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new RegressionProblem(this, cloner);
+      return new ClassificationProblem(this, cloner);
     }
 
@@ -77 +60 @@
     #region event propagation
     private void Value_Changed(object sender, EventArgs e) {
-      OnReset();
+      //OnReset();
     }
     #endregion

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableClass]
-  public abstract class DataAnalysisProblem<T> : Problem<IDataAnalysisEvaluator<T>, IDataAnalysisSolutionCreator<T>>,
+  public abstract class DataAnalysisProblem<T> : ParameterizedNamedItem,
     IDataAnalysisProblem<T>
     where T : class, IDataAnalysisProblemData {
     private const string ProblemDataParameterName = "ProblemData";
+    private const string ProblemDataParameterDescription = "";
     #region parameter properties
     IParameter IDataAnalysisProblem.ProblemDataParameter {
@@ -54 +56 @@
     public DataAnalysisProblem()
       : base() {
+      Parameters.Add(new ValueParameter<T>(ProblemDataParameterName, ProblemDataParameterDescription));
+    }
+
+    private void RegisterEventHandlers() {
+      ProblemDataParameter.Value.Changed += new EventHandler(ProblemDataParameter_ValueChanged);
+    }
+    private void ProblemDataParameter_ValueChanged(object sender, EventArgs e) {
+      OnProblemDataChanged();
+      OnReset();
+    }
+
+    public event EventHandler ProblemDataChanged;
+    protected virtual void OnProblemDataChanged() {
+      var handler = ProblemDataChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler Reset;
+    protected virtual void OnReset() {
+      var handler = Reset;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
   }

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

@@ -109 +109 @@
   <ItemGroup>
     <Compile Include="ClassificationProblemData.cs" />
+    <Compile Include="ClassificationProblem.cs" />
     <Compile Include="RegressionProblemData.cs" />
     <Compile Include="DataAnalysisProblemData.cs" />
@@ -114 +115 @@
     <Compile Include="DataAnalysisProblem.cs" />
     <Compile Include="Dataset.cs" />
-    <Compile Include="Interfaces\Classification\IClassificationEvaluator.cs" />
     <Compile Include="Interfaces\Classification\IClassificationModel.cs" />
     <Compile Include="Interfaces\Classification\IClassificationProblem.cs" />
     <Compile Include="Interfaces\Classification\IClassificationProblemData.cs" />
     <Compile Include="Interfaces\Classification\IClassificationSolution.cs" />
-    <Compile Include="Interfaces\Classification\IClassificationSolutionCreator.cs" />
-    <Compile Include="Interfaces\IDataAnalysisEvaluator.cs" />
     <Compile Include="Interfaces\IDataAnalysisProblemData.cs" />
     <Compile Include="Interfaces\IDataAnalysisSolution.cs" />
-    <Compile Include="Interfaces\IDataAnalysisSolutionCreator.cs" />
     <Compile Include="Interfaces\IOnlineEvaluator.cs" />
-    <Compile Include="Interfaces\Regression\IRegressionEvaluator.cs" />
     <Compile Include="Interfaces\Regression\IRegressionModel.cs" />
     <Compile Include="Interfaces\Regression\IRegressionProblem.cs" />
     <Compile Include="Interfaces\Regression\IRegressionProblemData.cs" />
     <Compile Include="Interfaces\Regression\IRegressionSolution.cs" />
-    <Compile Include="Interfaces\Regression\IRegressionSolutionCreator.cs" />
     <Compile Include="OnlineEvaluators\OnlineCovarianceEvaluator.cs" />
     <Compile Include="OnlineEvaluators\OnlineMeanAbsolutePercentageErrorEvaluator.cs" />

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblem.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IClassificationProblem : IDataAnalysisProblem<IClassificationProblemData> {
-    new IClassificationSolutionCreator SolutionCreator { get; }
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public interface IDataAnalysisProblem : IProblem {
+  public interface IDataAnalysisProblem : IItem {
     IParameter ProblemDataParameter { get; }
     IDataAnalysisProblemData ProblemData { get; }
+    event EventHandler ProblemDataChanged;
   }
 
@@ -33 +34 @@
     new IValueParameter<T> ProblemDataParameter { get; }
     new T ProblemData { get; }
-    new IDataAnalysisEvaluator<T> Evaluator { get; }
-    new IDataAnalysisSolutionCreator<T> SolutionCreator { get; }
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblem.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IRegressionProblem : IDataAnalysisProblem<IRegressionProblemData> {
-    new IRegressionSolutionCreator SolutionCreator { get; }
   }
 }

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -36 +30 @@
   public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>,
     IRegressionProblem {
-    private const string ProblemDataParameterName = "ProblemData";
-    #region properties
-    public new IDataAnalysisEvaluator<IRegressionProblemData> Evaluator {
-      get { throw new NotImplementedException(); }
-    }
-
-    public new IRegressionSolutionCreator SolutionCreator {
-      get { throw new NotImplementedException(); }
-    }
-    IDataAnalysisSolutionCreator<IRegressionProblemData> IDataAnalysisProblem<IRegressionProblemData>.SolutionCreator {
-      get { throw new NotImplementedException(); }
-    }
-    #endregion
-
     public RegressionProblem(RegressionProblem original, Cloner cloner)
       : base(original, cloner) {
-      RegisterEventHandlers();
     }
     [StorableConstructor]
@@ -58 +37 @@
     public RegressionProblem()
       : base() {
-      Parameters.Add(new ValueParameter<IRegressionProblemData>(ProblemDataParameterName, "", new RegressionProblemData()));
-      RegisterEventHandlers();
     }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      RegisterEventHandlers();
     }
 
@@ -70 +46 @@
       return new RegressionProblem(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
   }
 }