Changeset 17907


Ignore:
Timestamp:
03/17/21 09:13:34 (16 months ago)
Author:
chaider
Message:

#3073

  • Set cloning constructor to protected in IntervalArithCompiledExpressionBoundsEstimator
  • Add Content == null handle in the OnContentChanged in ShapeConstraintView
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalArithCompiledExpressionBoundsEstimator.cs

    r17906 r17907  
    7777    private IntervalArithCompiledExpressionBoundsEstimator(StorableConstructorFlag _) : base(_) { }
    7878
    79     private IntervalArithCompiledExpressionBoundsEstimator(IntervalArithCompiledExpressionBoundsEstimator original, Cloner cloner) : base(original, cloner) { }
     79    protected IntervalArithCompiledExpressionBoundsEstimator(IntervalArithCompiledExpressionBoundsEstimator original, Cloner cloner) : base(original, cloner) { }
    8080
    8181    public override IDeepCloneable Clone(Cloner cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ShapeConstraintView.cs

    r17902 r17907  
    4545    protected override void OnContentChanged() {
    4646      base.OnContentChanged();
    47       this.regionView.Content = Content.Regions;
    48       UpdateControls();
     47      if (Content == null) {
     48        this.regionView.Content = null;
     49      } else {
     50        this.regionView.Content = Content.Regions;
     51        UpdateControls();
     52      }
    4953    }
    5054
     
    178182      }
    179183
    180       if ((int)numberOfDerivationsComboBox.SelectedItem == 1)
    181         Content.NumberOfDerivations = 1;
    182       else if ((int)numberOfDerivationsComboBox.SelectedItem == 2)
    183         Content.NumberOfDerivations = 2;
    184       else if ((int)numberOfDerivationsComboBox.SelectedItem == 3)
    185         Content.NumberOfDerivations = 3;
     184      if (Content != null) {
     185        if ((int)numberOfDerivationsComboBox.SelectedItem == 1)
     186          Content.NumberOfDerivations = 1;
     187        else if ((int)numberOfDerivationsComboBox.SelectedItem == 2)
     188          Content.NumberOfDerivations = 2;
     189        else if ((int)numberOfDerivationsComboBox.SelectedItem == 3)
     190          Content.NumberOfDerivations = 3;
     191      }
    186192    }
    187193
Note: See TracChangeset for help on using the changeset viewer.