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

Timestamp:

03/07/11 18:11:23 (13 years ago)

Author:

gkronber

Message:

#1418 renamed interface for interpreter, worked on solutions and models and implemented SVM regression.

Location:

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

Files:

• ClassificationSolution.cs (modified) (1 diff)
• DataAnalysisSolution.cs (modified) (3 diffs)
• RegressionSolution.cs (modified) (1 diff)

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

@@ -43 +43 @@
       : base(original, cloner) {
     }
-    public ClassificationSolution()
-      : base() {
+    public ClassificationSolution(IClassificationModel model, IClassificationProblemData problemData)
+      : base(model, problemData) {
       DoubleArray thresholds = new DoubleArray();
       Add(new Result(ThresholdsResultsName, "The threshold values for class boundaries.", thresholds));

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

@@ -30 +30 @@
 using HeuristicLab.Optimization;
 using System;
+using System.Drawing;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -39 +40 @@
     private const string ModelResultName = "Model";
     private const string ProblemDataResultName = "ProblemData";
+
+    public override Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Function; }
+    }
+
     #region properties
-
     public IDataAnalysisModel Model {
       get { return (IDataAnalysisModel)this[ModelResultName].Value; }
-      set {
-        if (this[ModelResultName].Value != value) {
-          if (value != null) {
-            this[ModelResultName].Value = value;
-            OnModelChanged(EventArgs.Empty);
-          }
-        }
-      }
+      //set {
+      //  if (this[ModelResultName].Value != value) {
+      //    if (value != null) {
+      //      this[ModelResultName].Value = value;
+      //      OnModelChanged(EventArgs.Empty);
+      //    }
+      //  }
+      //}
     }
 
     public IDataAnalysisProblemData ProblemData {
       get { return (IDataAnalysisProblemData)this[ProblemDataResultName].Value; }
-      set {
-        if (this[ProblemDataResultName].Value != value) {
-          if (value != null) {
-            this[ProblemDataResultName].Value = value;
-            OnProblemDataChanged(EventArgs.Empty);
-          }
-        }
-      }
+      //set {
+      //  if (this[ProblemDataResultName].Value != value) {
+      //    if (value != null) {
+      //      ProblemData.Changed -= new EventHandler(ProblemData_Changed);
+      //      this[ProblemDataResultName].Value = value;
+      //      ProblemData.Changed += new EventHandler(ProblemData_Changed);
+      //      OnProblemDataChanged(EventArgs.Empty);
+      //    }
+      //  }
+      //}
     }
     #endregion
@@ -73 +80 @@
       description = original.Description;
     }
-    public DataAnalysisSolution()
+    public DataAnalysisSolution(IDataAnalysisModel model, IDataAnalysisProblemData problemData)
       : base() {
       name = string.Empty;
       description = string.Empty;
-      Add(new Result(ModelResultName, "The symbolic data analysis model.", typeof(IDataAnalysisModel)));
-      Add(new Result(ProblemDataResultName, "The symbolic data analysis problem data.", typeof(IDataAnalysisProblemData)));
+      Add(new Result(ModelResultName, "The symbolic data analysis model.", model));
+      Add(new Result(ProblemDataResultName, "The symbolic data analysis problem data.", problemData));
+
+      problemData.Changed += new EventHandler(ProblemData_Changed);
+    }
+
+    private void ProblemData_Changed(object sender, EventArgs e) {
+      OnProblemDataChanged(e);
     }
 

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

@@ -42 +42 @@
       : base(original, cloner) {
     }
-    public RegressionSolution()
-      : base() {
+    public RegressionSolution(IRegressionModel model, IRegressionProblemData problemData)
+      : base(model, problemData) {
     }