Changeset 18034 for trunk

Timestamp:

07/27/21 14:43:06 (3 years ago)

Author:

chaider

Message:

#3073 Moved VariableRanges from RegressionProblemData to DataAnalysisProblemData to make it also available in classification problems

Location:

trunk/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Implementation/DataAnalysisProblemData.cs (modified) (4 diffs)
• Implementation/Regression/RegressionProblemData.cs (modified) (5 diffs)
• Implementation/Regression/ShapeConstrainedRegressionProblemData.cs (modified) (1 diff)
• Interfaces/IDataAnalysisProblemData.cs (modified) (1 diff)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

@@ -38 +38 @@
     protected const string TestPartitionParameterName = "TestPartition";
     protected const string TransformationsParameterName = "Transformations";
+    protected const string VariableRangesParameterName = "VariableRanges";
 
     #region parameter properites
@@ -48 +49 @@
       }
     }
+
+    public IFixedValueParameter<IntervalCollection> VariableRangesParameter => (IFixedValueParameter<IntervalCollection>)Parameters[VariableRangesParameterName];
+    public IntervalCollection VariableRanges => VariableRangesParameter.Value;
 
     private IFixedValueParameter<ReadOnlyCheckedItemList<StringValue>> inputVariablesParameter;
@@ -151 +155 @@
         TransformationsParameter.Hidden = true;
       }
+      if (!Parameters.ContainsKey(VariableRangesParameterName)) {
+        var variableRanges = Dataset.GetVariableRanges();
+        Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));
+      }
       RegisterEventHandlers();
     }
 
-    protected DataAnalysisProblemData(IDataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations = null) {
+    protected DataAnalysisProblemData(IDataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations = null, IntervalCollection variableRanges = null) {
       if (dataset == null) throw new ArgumentNullException("The dataset must not be null.");
       if (allowedInputVariables == null) throw new ArgumentNullException("The allowed input variables must not be null.");
@@ -178 +186 @@
       Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd)));
       Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", transformationsList.AsReadOnly()));
+
+      if (variableRanges == null) {
+        variableRanges = Dataset.GetVariableRanges();
+      }
+      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));
 
       TransformationsParameter.Hidden = true;

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -34 +34 @@
   public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
     protected const string TargetVariableParameterName = "TargetVariable";
-    protected const string VariableRangesParameterName = "VariableRanges";
+    //protected const string VariableRangesParameterName = "VariableRanges";
     public string Filename { get; set; }
 
@@ -99 +99 @@
     #region parameter properties
     public IConstrainedValueParameter<StringValue> TargetVariableParameter => (IConstrainedValueParameter<StringValue>)Parameters[TargetVariableParameterName];
-    public IFixedValueParameter<IntervalCollection> VariableRangesParameter => (IFixedValueParameter<IntervalCollection>)Parameters[VariableRangesParameterName];
+    /*public IFixedValueParameter<IntervalCollection> VariableRangesParameter => (IFixedValueParameter<IntervalCollection>)Parameters[VariableRangesParameterName];
     #endregion
 
@@ -105 +105 @@
     public IntervalCollection VariableRanges {
       get => VariableRangesParameter.Value;
-    }
+    }*/
 
     public string TargetVariable {
@@ -129 +129 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if (!Parameters.ContainsKey(VariableRangesParameterName)) {
+      /*if (!Parameters.ContainsKey(VariableRangesParameterName)) {
         var variableRanges = Dataset.GetVariableRanges();
         Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));
-      }
+      }*/
 
       RegisterParameterEvents();
@@ -158 +158 @@
 
     public RegressionProblemData(IDataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable,
-      IEnumerable<ITransformation> transformations = null,
-      IntervalCollection variableRanges = null)
+      IEnumerable<ITransformation> transformations = null/*,
+      IntervalCollection variableRanges = null*/)
       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
       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()));
-      if (variableRanges == null) {
+      /*if (variableRanges == null) {
         variableRanges = Dataset.GetVariableRanges();
       }
-      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));
+      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));*/
     }
     private void RegisterParameterEvents() {

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ShapeConstrainedRegressionProblemData.cs

@@ -152 +152 @@
                                                  IntRange trainingPartition, IntRange testPartition,
                                                  IEnumerable<ITransformation> transformations = null, ShapeConstraints sc = null, IntervalCollection variableRanges = null)
-    : base(dataset, allowedInputVariables, targetVariable, transformations ?? Enumerable.Empty<ITransformation>(), variableRanges) {
+    : base(dataset, allowedInputVariables, targetVariable, transformations ?? Enumerable.Empty<ITransformation>()) {
       TrainingPartition.Start = trainingPartition.Start;
       TrainingPartition.End = trainingPartition.End;

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

@@ -35 +35 @@
     IEnumerable<string> AllowedInputVariables { get; }
 
+    IntervalCollection VariableRanges { get; }
+
     double[,] AllowedInputsTrainingValues { get; }
     double[,] AllowedInputsTestValues { get; }

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -29 +29 @@
   public interface IRegressionProblemData : IDataAnalysisProblemData {
     string TargetVariable { get; set; }
-    IntervalCollection VariableRanges { get; }
+    
     IEnumerable<double> TargetVariableValues { get; }
     IEnumerable<double> TargetVariableTrainingValues { get; }