Changeset 7989 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

Timestamp:

06/12/12 10:31:56 (12 years ago)

Author:

mkommend

Message:

#1081: Improved performance of time series prognosis.

File:

• branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs (modified) (5 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

@@ -33 +33 @@
   [Item("TimeSeriesPrognosisProblemData", "Represents an item containing all data defining a time series prognosis problem.")]
   public class TimeSeriesPrognosisProblemData : DataAnalysisProblemData, ITimeSeriesPrognosisProblemData {
-    protected const string TargetVariablesParameterName = "TargetVariables";
+    protected const string TargetVariableParameterName = "TargetVariable";
 
     #region default data
@@ -1540 +1540 @@
     private static readonly Dataset defaultDataset;
     private static readonly IEnumerable<string> defaultAllowedInputVariables;
-    private static readonly string[] defaultTargetVariables;
+    private static readonly string defaultTargetVariable;
 
     private static readonly TimeSeriesPrognosisProblemData emptyProblemData;
@@ -1551 +1551 @@
       defaultDataset.Name = "Mackey-Glass (t=17) Time Series Benchmark Dataset";
       defaultAllowedInputVariables = new List<string>() { "x" };
-      defaultTargetVariables = new string[] { "x" };
+      defaultTargetVariable = "x";
 
       var problemData = new TimeSeriesPrognosisProblemData();
@@ -1563 +1563 @@
       problemData.Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
       problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
-      problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariablesParameterName, new ItemSet<StringValue>()));
+      problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
       emptyProblemData = problemData;
     }
     #endregion
 
-    public ValueParameter<CheckedItemList<StringValue>> TargetVariablesParameter {
-      get { return (ValueParameter<CheckedItemList<StringValue>>)Parameters[TargetVariablesParameterName]; }
+    public ConstrainedValueParameter<StringValue> TargetVariableParameter {
+      get { return (ConstrainedValueParameter<StringValue>)Parameters[TargetVariableParameterName]; }
     }
-    public IEnumerable<string> TargetVariables {
-      get { return TargetVariablesParameter.Value.CheckedItems.Select(x => x.Value.Value); }
+    public string TargetVariable {
+      get { return TargetVariableParameter.Value.Value; }
     }
 
@@ -1592 +1592 @@
 
     public TimeSeriesPrognosisProblemData()
-      : this(defaultDataset, defaultAllowedInputVariables, defaultTargetVariables) {
+      : this(defaultDataset, defaultAllowedInputVariables, defaultTargetVariable) {
     }
 
-    public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<string> targetVariables)
+    public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
       : base(dataset, allowedInputVariables) {
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
-      var targetVariablesList = new CheckedItemList<StringValue>(variables);
-      foreach (var targetVar in targetVariables) {
-        targetVariablesList.SetItemCheckedState(targetVariablesList.Single(x => x.Value == targetVar), true);
-      }
-      Parameters.Add(new FixedValueParameter<CheckedItemList<StringValue>>(TargetVariablesParameterName, targetVariablesList));
+      Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.First(x => x.Value == targetVariable)));
       RegisterParameterEvents();
     }
 
     private void RegisterParameterEvents() {
-      TargetVariablesParameter.Value.CheckedItemsChanged += TargetVariableParameter_ValueChanged;
+      TargetVariableParameter.ValueChanged += new EventHandler(TargetVariableParameter_ValueChanged);
     }
-
     private void TargetVariableParameter_ValueChanged(object sender, EventArgs e) {
       OnChanged();