Changeset 17907 for trunk

Timestamp:

03/17/21 09:13:34 (3 years ago)

Author:

chaider

Message:

#3073

• Set cloning constructor to protected in IntervalArithCompiledExpressionBoundsEstimator
• Add Content == null handle in the OnContentChanged in ShapeConstraintView

Location:

trunk

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalArithCompiledExpressionBoundsEstimator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ShapeConstraintView.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalArithCompiledExpressionBoundsEstimator.cs

@@ -77 +77 @@
     private IntervalArithCompiledExpressionBoundsEstimator(StorableConstructorFlag _) : base(_) { }
 
-    private IntervalArithCompiledExpressionBoundsEstimator(IntervalArithCompiledExpressionBoundsEstimator original, Cloner cloner) : base(original, cloner) { }
+    protected IntervalArithCompiledExpressionBoundsEstimator(IntervalArithCompiledExpressionBoundsEstimator original, Cloner cloner) : base(original, cloner) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ShapeConstraintView.cs

@@ -45 +45 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      this.regionView.Content = Content.Regions;
-      UpdateControls();
+      if (Content == null) {
+        this.regionView.Content = null;
+      } else {
+        this.regionView.Content = Content.Regions;
+        UpdateControls();
+      }
     }
 
@@ -178 +182 @@
       }
 
-      if ((int)numberOfDerivationsComboBox.SelectedItem == 1)
-        Content.NumberOfDerivations = 1;
-      else if ((int)numberOfDerivationsComboBox.SelectedItem == 2)
-        Content.NumberOfDerivations = 2;
-      else if ((int)numberOfDerivationsComboBox.SelectedItem == 3)
-        Content.NumberOfDerivations = 3;
+      if (Content != null) {
+        if ((int)numberOfDerivationsComboBox.SelectedItem == 1)
+          Content.NumberOfDerivations = 1;
+        else if ((int)numberOfDerivationsComboBox.SelectedItem == 2)
+          Content.NumberOfDerivations = 2;
+        else if ((int)numberOfDerivationsComboBox.SelectedItem == 3)
+          Content.NumberOfDerivations = 3;
+      }
     }