Changeset 16930

Timestamp:

05/08/19 15:57:35 (6 years ago)

Author:

chaider

Message:

#2971

• removed setter from VariableRanges and IntervalConstraints
• changed protected method in sealed class to private

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.Designer.cs

@@ -90 +90 @@
     #endregion
 
-    protected System.Windows.Forms.DataGridView dataGridView;
+    private System.Windows.Forms.DataGridView dataGridView;
     private System.Windows.Forms.GroupBox groupBox1;
   }

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

@@ -107 +107 @@
     public IntervalCollection VariableRanges {
       get => VariableRangesParameter.Value;
-      set => VariableRanges = value ?? throw new ArgumentNullException("Variable Ranges", "The given variable ranges are null");
     }
 
@@ -115 +114 @@
     public ProblemDataConstraint IntervalConstraints {
       get => IntervalConstraintsParameter.Value;
-      set => IntervalConstraints = value ?? throw new ArgumentNullException("IntervalCosntraint", "The given Constraint is null.");
     }
 
@@ -147 +145 @@
     private void AfterDeserialization() {
       if (!Parameters.ContainsKey(VariableRangesParameterName)) {
-        var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
-        IntervalCollection intervalCollection = new IntervalCollection();
-        foreach (var variable in variables) {
-          if (!this.Dataset.DoubleVariables.Contains(variable.Value)) continue; // intervals are only possible for double variables
-          var variableInterval = Interval.GetInterval(this.Dataset.GetDoubleValues(variable.Value));
-          intervalCollection.VariableIntervals.Add(variable.Value, variableInterval);
-        }
-
+        var intervalCollection = CalculateDatasetIntervals(this.Dataset);
         Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
       }
@@ -187 +178 @@
       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()));
-
-      IntervalCollection intervalCollection = new IntervalCollection();
-      foreach (var variable in variables) {
-        if (!dataset.DoubleVariables.Contains(variable.Value)) continue; // intervals are only possible for double variables
-        var variableInterval = Interval.GetInterval(dataset.GetDoubleValues(variable.Value));
-        intervalCollection.VariableIntervals.Add(variable.Value, variableInterval);
-      }
-      
+      var intervalCollection = CalculateDatasetIntervals(this.Dataset);
       Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
       Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
@@ -200 +184 @@
     }
 
+    private static IntervalCollection CalculateDatasetIntervals(IDataset dataset) {
+      IntervalCollection intervalCollection = new IntervalCollection();
+      foreach (var variable in dataset.DoubleVariables) {// intervals are only possible for double variables
+        var variableInterval = Interval.GetInterval(dataset.GetDoubleValues(variable));
+        intervalCollection.AddInterval(variable, variableInterval);
+      }
+
+      return intervalCollection;
+    }
+
     private void RegisterParameterEvents() {
       TargetVariableParameter.ValueChanged += new EventHandler(TargetVariableParameter_ValueChanged);

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -28 +28 @@
     string TargetVariable { get; set; }
 
-    IntervalCollection VariableRanges { get; set; }
-    ProblemDataConstraint IntervalConstraints { get; set; }
+    IntervalCollection VariableRanges { get;}
+    ProblemDataConstraint IntervalConstraints { get; }
 
     IEnumerable<double> TargetVariableValues { get; }