Changeset 16426 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression

Timestamp:

12/21/18 09:33:30 (6 years ago)

Author:

chaider

Message:

#2971

• Added NamedIntervals class
• Set NamedIntervals Parameter in RegressionProblemData

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (4 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.DataAnalysis.Implementation;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -92 +93 @@
       problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
-      problemData.Parameters.Add(new FixedValueParameter<VariableRanges>(VariableRangesParameterName, new VariableRanges()));
+      problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, new NamedIntervals()));
       emptyProblemData = problemData;
     }
@@ -101 +102 @@
     }
 
-    public IFixedValueParameter<VariableRanges> VariableRangesParameter {
-      get { return (IFixedValueParameter<VariableRanges>)Parameters[VariableRangesParameterName]; }
+    public IFixedValueParameter<NamedIntervals> VariableRangesParameter {
+      get { return (IFixedValueParameter<NamedIntervals>)Parameters[VariableRangesParameterName]; }
     }
 
@@ -159 +160 @@
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
       Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));
-      Parameters.Add(new FixedValueParameter<VariableRanges>(VariableRangesParameterName, new VariableRanges()));
+
+      NamedIntervals namedIntervals = new NamedIntervals();
+      foreach (var variable in variables) {
+        var variableInteval = Interval.GetInterval(dataset.GetDoubleValues(variable.Value));
+        namedIntervals.Add(variable.Value, variableInteval);
+      }
+
+      Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
       RegisterParameterEvents();
     }