Changeset 3884 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs

Timestamp:

06/01/10 17:58:03 (14 years ago)

Author:

gkronber

Message:

Worked on support vector regression operators and views. #1009

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs

@@ -36 +36 @@
   [StorableClass]
   public abstract class DataAnalysisSolution : NamedItem {
+    protected DataAnalysisSolution()
+      : base() { }
+    protected DataAnalysisSolution(DataAnalysisProblemData problemData) : this(problemData, double.NegativeInfinity, double.PositiveInfinity) { }
+    protected DataAnalysisSolution(DataAnalysisProblemData problemData, double lowerEstimationLimit, double upperEstimationLimit)
+      : this() {
+      this.problemData = problemData;
+      this.lowerEstimationLimit = lowerEstimationLimit;
+      this.upperEstimationLimit = upperEstimationLimit;
+      Initialize();
+    }
+
+    [StorableConstructor]
+    private DataAnalysisSolution(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      if (problemData != null) RegisterProblemDataEvents();
+    }
+
     [Storable]
     private DataAnalysisProblemData problemData;
@@ -43 +61 @@
         if (problemData != value) {
           if (value == null) throw new ArgumentNullException();
+          if (model != null && problemData != null && !problemData.InputVariables.Select(c => c.Value).SequenceEqual(
+            value.InputVariables.Select(c => c.Value)))
+            throw new ArgumentException("Could not set new problem data with different structure");
+
           if (problemData != null) DeregisterProblemDataEvents();
           problemData = value;
           RegisterProblemDataEvents();
-          OnProblemDataChanged(EventArgs.Empty);
+          OnProblemDataChanged();
         }
       }
     }
+
+    [Storable]
+    private IDataAnalysisModel model;
+    public IDataAnalysisModel Model {
+      get { return model; }
+      set {
+        if (model != value) {
+          if (value == null) throw new ArgumentNullException();
+          model = value;
+          OnModelChanged();
+        }
+      }
+    }
+
     [Storable]
     private double lowerEstimationLimit;
@@ -57 +93 @@
         if (lowerEstimationLimit != value) {
           lowerEstimationLimit = value;
-          OnEstimatedValuesChanged(EventArgs.Empty);
+          RecalculateEstimatedValues();
         }
       }
@@ -69 +105 @@
         if (upperEstimationLimit != value) {
           upperEstimationLimit = value;
-          OnEstimatedValuesChanged(EventArgs.Empty);
+          RecalculateEstimatedValues();
         }
       }
@@ -77 +113 @@
     public abstract IEnumerable<double> EstimatedTrainingValues { get; }
     public abstract IEnumerable<double> EstimatedTestValues { get; }
-
-    protected DataAnalysisSolution() : base() {
-      Name = ItemName;
-      Description = ItemDescription;
-    }
-    protected DataAnalysisSolution(DataAnalysisProblemData problemData) : this(problemData, double.NegativeInfinity, double.PositiveInfinity) { }
-    protected DataAnalysisSolution(DataAnalysisProblemData problemData, double lowerEstimationLimit, double upperEstimationLimit)
-      : this() {
-      this.problemData = problemData;
-      this.lowerEstimationLimit = lowerEstimationLimit;
-      this.upperEstimationLimit = upperEstimationLimit;
-      Initialize();
-    }
-
-    [StorableConstructor]
-    private DataAnalysisSolution(bool deserializing) : base(deserializing) { }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void Initialize() {
-      if (problemData != null) RegisterProblemDataEvents();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      DataAnalysisSolution clone = (DataAnalysisSolution)base.Clone(cloner);
-      // don't clone the problem data!
-      clone.problemData = problemData;
-      clone.lowerEstimationLimit = lowerEstimationLimit;
-      clone.upperEstimationLimit = upperEstimationLimit;
-      clone.Initialize();
-      return clone;
-    }
+    protected abstract void RecalculateEstimatedValues();
 
     #region Events
@@ -116 +122 @@
       ProblemData.ProblemDataChanged += new EventHandler(ProblemData_Changed);
     }
-
     private void ProblemData_Changed(object sender, EventArgs e) {
-      OnProblemDataChanged(EventArgs.Empty);
+      OnProblemDataChanged();
     }
 
     public event EventHandler ProblemDataChanged;
-    protected virtual void OnProblemDataChanged(EventArgs e) {
+    protected virtual void OnProblemDataChanged() {
+      RecalculateEstimatedValues();
       var listeners = ProblemDataChanged;
       if (listeners != null)
-        listeners(this, e);
+        listeners(this, EventArgs.Empty);
+    }
+
+    public event EventHandler ModelChanged;
+    protected virtual void OnModelChanged() {
+      RecalculateEstimatedValues();
+      EventHandler handler = ModelChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
     }
 
     public event EventHandler EstimatedValuesChanged;
-    protected virtual void OnEstimatedValuesChanged(EventArgs e) {
+    protected virtual void OnEstimatedValuesChanged() {
       var listeners = EstimatedValuesChanged;
       if (listeners != null)
-        listeners(this, e);
+        listeners(this, EventArgs.Empty);
     }
     #endregion
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      DataAnalysisSolution clone = (DataAnalysisSolution)base.Clone(cloner);
+      // don't clone the problem data!
+      clone.problemData = problemData;
+      clone.Model = (IDataAnalysisModel)cloner.Clone(model);
+      clone.lowerEstimationLimit = lowerEstimationLimit;
+      clone.upperEstimationLimit = upperEstimationLimit;
+      clone.Initialize();
+      return clone;
+    }
   }
 }