Changeset 3294 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/RegressionProblem.cs

Timestamp:

04/09/10 17:28:32 (14 years ago)

Author:

gkronber

Message:

Added first version of architecture altering operators for ADFs. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/RegressionProblem.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/RegressionProblem.cs

@@ -37 +37 @@
   [StorableClass]
   public class RegressionProblem : ParameterizedNamedItem {
+    private const string RegressionProblemDataParameterName = "RegressionProblemData";
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
@@ -42 +43 @@
 
     #region Parameter Properties
-    public ValueParameter<Dataset> DatasetParameter {
-      get { return (ValueParameter<Dataset>)Parameters["Dataset"]; }
-    }
-    public ValueParameter<StringValue> TargetVariableParameter {
-      get { return (ValueParameter<StringValue>)Parameters["TargetVariable"]; }
-    }
-    public ValueParameter<ItemList<StringValue>> InputVariablesParameter {
-      get { return (ValueParameter<ItemList<StringValue>>)Parameters["InputVariables"]; }
-    }
-    public ValueParameter<IntValue> TrainingSamplesStartParameter {
-      get { return (ValueParameter<IntValue>)Parameters["TrainingSamplesStart"]; }
-    }
-    public ValueParameter<IntValue> TrainingSamplesEndParameter {
-      get { return (ValueParameter<IntValue>)Parameters["TrainingSamplesEnd"]; }
-    }
-    public OptionalValueParameter<IntValue> ValidationSamplesStartParameter {
-      get { return (OptionalValueParameter<IntValue>)Parameters["ValidationSamplesStart"]; }
-    }
-    public OptionalValueParameter<IntValue> ValidationSamplesEndParameter {
-      get { return (OptionalValueParameter<IntValue>)Parameters["ValidationSamplesEnd"]; }
-    }
-    public ValueParameter<IntValue> TestSamplesStartParameter {
-      get { return (ValueParameter<IntValue>)Parameters["TestSamplesStart"]; }
-    }
-    public ValueParameter<IntValue> TestSamplesEndParameter {
-      get { return (ValueParameter<IntValue>)Parameters["TestSamplesEnd"]; }
+    public ValueParameter<RegressionProblemData> RegressionProblemDataParameter {
+      get { return (ValueParameter<RegressionProblemData>)Parameters[RegressionProblemDataParameterName]; }
     }
     #endregion
     #region properties
-    public Dataset Dataset {
-      get { return DatasetParameter.Value; }
-      set { DatasetParameter.Value = value; }
-    }
-    public StringValue TargetVariable {
-      get { return TargetVariableParameter.Value; }
-      set { TargetVariableParameter.Value = value; }
-    }
-    public ItemList<StringValue> InputVariables {
-      get { return InputVariablesParameter.Value; }
-      set { InputVariablesParameter.Value = value; }
-    }
-    public IntValue TrainingSamplesStart {
-      get { return TrainingSamplesStartParameter.Value; }
-      set { TrainingSamplesStartParameter.Value = value; }
-    }
-    public IntValue TrainingSamplesEnd {
-      get { return TrainingSamplesEndParameter.Value; }
-      set { TrainingSamplesEndParameter.Value = value; }
-    }
-    public IntValue ValidationSamplesStart {
-      get { return ValidationSamplesStartParameter.Value; }
-      set { ValidationSamplesStartParameter.Value = value; }
-    }
-    public IntValue ValidationSamplesEnd {
-      get { return ValidationSamplesEndParameter.Value; }
-      set { ValidationSamplesEndParameter.Value = value; }
-    }
-    public IntValue TestSamplesStart {
-      get { return TestSamplesStartParameter.Value; }
-      set { TestSamplesStartParameter.Value = value; }
-    }
-    public IntValue TestSamplesEnd {
-      get { return TestSamplesEndParameter.Value; }
-      set { TestSamplesEndParameter.Value = value; }
+    public RegressionProblemData RegressionProblemData {
+      get { return RegressionProblemDataParameter.Value; }
+      set { RegressionProblemDataParameter.Value = value; }
     }
     #endregion
@@ -111 +56 @@
     public RegressionProblem()
       : base() {
-      var dataset = new Dataset();
-      // TODO: wiring for sanity checks of parameter values based on dataset (target & input variables available?, training and test partition correct?...)
-      Parameters.Add(new ValueParameter<Dataset>("Dataset", "The data set containing data to be analyzer.", dataset));
-      Parameters.Add(new ValueParameter<StringValue>("TargetVariable", "The target variable for which a regression model should be created.", new StringValue()));
-      Parameters.Add(new ValueParameter<ItemList<StringValue>>("InputVariables", "The input variables (regressors) that are available for the regression model.", new ItemList<StringValue>()));
-      Parameters.Add(new ValueParameter<IntValue>("TrainingSamplesStart", "The start index of the training partition.", new IntValue()));
-      Parameters.Add(new ValueParameter<IntValue>("TrainingSamplesEnd", "The end index of the training partition.", new IntValue()));
-      Parameters.Add(new OptionalValueParameter<IntValue>("ValidationSamplesStart", "The start index of the validation partition."));
-      Parameters.Add(new OptionalValueParameter<IntValue>("ValidationSamplesEnd", "The end index of the validation partition."));
-      Parameters.Add(new ValueParameter<IntValue>("TestSamplesStart", "The start index of the test partition.", new IntValue()));
-      Parameters.Add(new ValueParameter<IntValue>("TestSamplesEnd", "The end index of the test partition.", new IntValue()));
+      Parameters.Add(new ValueParameter<RegressionProblemData>(RegressionProblemDataParameterName, "The data set, target variable and input variables of the regression problem.", new RegressionProblemData()));
     }
 
     [StorableConstructor]
     private RegressionProblem(bool deserializing) : base() { }
-
-    public virtual void ImportFromFile(string fileName) {
-      var csvFileParser = new CsvFileParser();
-      csvFileParser.Parse(fileName);
-      Name = "Regression Problem (imported from " + Path.GetFileName(fileName);
-      Dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      Dataset.Name = Path.GetFileName(fileName);
-      TargetVariable = new StringValue(Dataset.VariableNames.First());
-      InputVariables = new ItemList<StringValue>(Dataset.VariableNames.Skip(1).Select(s => new StringValue(s)));
-      TrainingSamplesStart = new IntValue(0);
-      TrainingSamplesEnd = new IntValue(csvFileParser.Rows);
-      TestSamplesStart = new IntValue(0);
-      TestSamplesEnd = new IntValue(csvFileParser.Rows);
-    }
   }
 }