Changeset 5586 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/RegressionProblemData.cs

Timestamp:

03/02/11 00:52:18 (13 years ago)

Author:

mkommend

Message:

#1418: Adapated DataAnalysisProblemData as well as RegressionProblemData to use parameters.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/RegressionProblemData.cs (modified) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +32 @@
   [StorableClass]
   public sealed class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData {
+    private const string TargetVariableParameterName = "TargetVariable";
 
     #region default data
@@ -72 +75 @@
     #endregion
 
-    #region propeties
-    [Storable]
-    private string targetVariable;
-    public string TargetVariable {
-      get { return targetVariable; }
-      set {
-        if (!Dataset.VariableNames.Contains(value))
-          throw new ArgumentException(string.Format("The target variable {0} is not present in the dataset", value));
-        if (targetVariable != value) {
-          targetVariable = value;
-          OnChanged();
-        }
-      }
+    public IValueParameter<StringValue> TargetVariableParameter {
+      get { return (IValueParameter<StringValue>)Parameters[TargetVariableParameterName]; }
     }
-    #endregion
+    public StringValue TargetVariable {
+      get { return TargetVariableParameter.Value; }
+    }
+
 
     [StorableConstructor]
@@ -99 +94 @@
     public RegressionProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
       : base(dataset, allowedInputVariables) {
-      TargetVariable = targetVariable;
+      Parameters.Add(new ConstrainedValueParameter<StringValue>("TargetVariable", new ItemSet<StringValue>(InputVariables), InputVariables.Where(x => x.Value == targetVariable).First()));
     }