Free cookie consent management tool by TermsFeed Policy Generator

Changeset 17370 for branches


Ignore:
Timestamp:
11/25/19 13:39:43 (5 years ago)
Author:
chaider
Message:

#2971 Removed the possibility of declaring open and closed intervals. All intervals are closed intervals now.

Location:
branches/2971_named_intervals
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs

    r16924 r17370  
    9494        if (!constraint.IsDerivation) {
    9595          var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges);
    96           if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
    97             constraint.InclusiveUpperBound)) {
     96          if (!constraint.Interval.Contains(res)) {
    9897            return true;
    9998          }
    … …  
    104103          }
    105104          var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(tree, variableRanges);
    106           if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
    107             constraint.InclusiveUpperBound)) {
     105          if (!constraint.Interval.Contains(res)) {
    108106            return true;
    109107          }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs

    r16927 r17370  
    115115      }
    116116
    117       var satisfied = constraint.Interval.Contains(resultInterval, constraint.InclusiveLowerBound, constraint.InclusiveUpperBound);
     117      var satisfied = constraint.Interval.Contains(resultInterval);
    118118      return satisfied;
    119119    }

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

    r16898 r17370  
    4747      this.lowerboundLabel = new System.Windows.Forms.Label();
    4848      this.upperboundLabel = new System.Windows.Forms.Label();
    49       this.incllowerboundLabel = new System.Windows.Forms.Label();
    50       this.inclupperboundLabel = new System.Windows.Forms.Label();
    5149      this.variableLabel = new System.Windows.Forms.Label();
    5250      this.numberderivationLabel = new System.Windows.Forms.Label();
    … …  
    5553      this.variableInput = new System.Windows.Forms.TextBox();
    5654      this.groupBox1 = new System.Windows.Forms.GroupBox();
     55      this.enabledLabel = new System.Windows.Forms.Label();
    5756      this.label1 = new System.Windows.Forms.Label();
    5857      this.numberderivationInput = new System.Windows.Forms.ComboBox();
    … …  
    6059      this.expressionInput = new System.Windows.Forms.TextBox();
    6160      this.expressionLabel = new System.Windows.Forms.Label();
    62       this.inclupperboundInput = new System.Windows.Forms.CheckBox();
    63       this.incllowerboundInput = new System.Windows.Forms.CheckBox();
    6461      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
    65       this.enabledLabel = new System.Windows.Forms.Label();
    6662      this.groupBox1.SuspendLayout();
    6763      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    … …  
    7369      this.lowerboundLabel.Location = new System.Drawing.Point(8, 101);
    7470      this.lowerboundLabel.Name = "lowerboundLabel";
    75       this.lowerboundLabel.Size = new System.Drawing.Size(69, 13);
     71      this.lowerboundLabel.Size = new System.Drawing.Size(90, 17);
    7672      this.lowerboundLabel.TabIndex = 2;
    7773      this.lowerboundLabel.Text = "Lowerbound:";
    … …  
    8278      this.upperboundLabel.Location = new System.Drawing.Point(8, 126);
    8379      this.upperboundLabel.Name = "upperboundLabel";
    84       this.upperboundLabel.Size = new System.Drawing.Size(69, 13);
     80      this.upperboundLabel.Size = new System.Drawing.Size(91, 17);
    8581      this.upperboundLabel.TabIndex = 3;
    8682      this.upperboundLabel.Text = "Upperbound:";
    87       //
    88       // incllowerboundLabel
    89       //
    90       this.incllowerboundLabel.AutoSize = true;
    91       this.incllowerboundLabel.Location = new System.Drawing.Point(8, 153);
    92       this.incllowerboundLabel.Name = "incllowerboundLabel";
    93       this.incllowerboundLabel.Size = new System.Drawing.Size(92, 13);
    94       this.incllowerboundLabel.TabIndex = 4;
    95       this.incllowerboundLabel.Text = "Incl. Lowerbound:";
    96       //
    97       // inclupperboundLabel
    98       //
    99       this.inclupperboundLabel.AutoSize = true;
    100       this.inclupperboundLabel.Location = new System.Drawing.Point(8, 178);
    101       this.inclupperboundLabel.Name = "inclupperboundLabel";
    102       this.inclupperboundLabel.Size = new System.Drawing.Size(92, 13);
    103       this.inclupperboundLabel.TabIndex = 5;
    104       this.inclupperboundLabel.Text = "Incl. Upperbound:";
    10583      //
    10684      // variableLabel
    … …  
    10987      this.variableLabel.Location = new System.Drawing.Point(8, 47);
    11088      this.variableLabel.Name = "variableLabel";
    111       this.variableLabel.Size = new System.Drawing.Size(48, 13);
     89      this.variableLabel.Size = new System.Drawing.Size(64, 17);
    11290      this.variableLabel.TabIndex = 7;
    11391      this.variableLabel.Text = "Variable:";
    … …  
    11896      this.numberderivationLabel.Location = new System.Drawing.Point(8, 74);
    11997      this.numberderivationLabel.Name = "numberderivationLabel";
    120       this.numberderivationLabel.Size = new System.Drawing.Size(65, 13);
     98      this.numberderivationLabel.Size = new System.Drawing.Size(84, 17);
    12199      this.numberderivationLabel.TabIndex = 8;
    122100      this.numberderivationLabel.Text = "#Derivation:";
    … …  
    128106      this.upperboundInput.Location = new System.Drawing.Point(108, 123);
    129107      this.upperboundInput.Name = "upperboundInput";
    130       this.upperboundInput.Size = new System.Drawing.Size(473, 20);
     108      this.upperboundInput.Size = new System.Drawing.Size(473, 22);
    131109      this.upperboundInput.TabIndex = 11;
    132110      this.upperboundInput.Validating += new System.ComponentModel.CancelEventHandler(this.upperboundInput_Validating);
    … …  
    139117      this.lowerboundInput.Location = new System.Drawing.Point(108, 98);
    140118      this.lowerboundInput.Name = "lowerboundInput";
    141       this.lowerboundInput.Size = new System.Drawing.Size(473, 20);
     119      this.lowerboundInput.Size = new System.Drawing.Size(473, 22);
    142120      this.lowerboundInput.TabIndex = 12;
    143121      this.lowerboundInput.Validating += new System.ComponentModel.CancelEventHandler(this.lowerboundInput_Validating);
    … …  
    150128      this.variableInput.Location = new System.Drawing.Point(108, 44);
    151129      this.variableInput.Name = "variableInput";
    152       this.variableInput.Size = new System.Drawing.Size(473, 20);
     130      this.variableInput.Size = new System.Drawing.Size(473, 22);
    153131      this.variableInput.TabIndex = 15;
    154132      //
    … …  
    161139      this.groupBox1.Controls.Add(this.expressionInput);
    162140      this.groupBox1.Controls.Add(this.expressionLabel);
    163       this.groupBox1.Controls.Add(this.inclupperboundInput);
    164       this.groupBox1.Controls.Add(this.incllowerboundInput);
    165141      this.groupBox1.Controls.Add(this.variableInput);
    166142      this.groupBox1.Controls.Add(this.lowerboundInput);
    … …  
    168144      this.groupBox1.Controls.Add(this.numberderivationLabel);
    169145      this.groupBox1.Controls.Add(this.variableLabel);
    170       this.groupBox1.Controls.Add(this.inclupperboundLabel);
    171       this.groupBox1.Controls.Add(this.incllowerboundLabel);
    172146      this.groupBox1.Controls.Add(this.upperboundLabel);
    173147      this.groupBox1.Controls.Add(this.lowerboundLabel);
    … …  
    180154      this.groupBox1.Text = "Interval Constraints Detail";
    181155      //
     156      // enabledLabel
     157      //
     158      this.enabledLabel.AutoSize = true;
     159      this.enabledLabel.Location = new System.Drawing.Point(8, 153);
     160      this.enabledLabel.Name = "enabledLabel";
     161      this.enabledLabel.Size = new System.Drawing.Size(64, 17);
     162      this.enabledLabel.TabIndex = 29;
     163      this.enabledLabel.Text = "Enabled:";
     164      //
    182165      // label1
    183166      //
    … …  
    185168      this.label1.Location = new System.Drawing.Point(11, -105);
    186169      this.label1.Name = "label1";
    187       this.label1.Size = new System.Drawing.Size(49, 13);
     170      this.label1.Size = new System.Drawing.Size(64, 17);
    188171      this.label1.TabIndex = 28;
    189172      this.label1.Text = "Enabled:";
    … …  
    196179      this.numberderivationInput.Location = new System.Drawing.Point(108, 71);
    197180      this.numberderivationInput.Name = "numberderivationInput";
    198       this.numberderivationInput.Size = new System.Drawing.Size(473, 21);
     181      this.numberderivationInput.Size = new System.Drawing.Size(473, 24);
    199182      this.numberderivationInput.TabIndex = 27;
    200183      this.numberderivationInput.SelectedIndexChanged += new System.EventHandler(this.numberderivationInput_SelectedIndexChanged);
    … …  
    203186      //
    204187      this.ischeckedCheckBox.AutoSize = true;
    205       this.ischeckedCheckBox.Location = new System.Drawing.Point(108, 200);
     188      this.ischeckedCheckBox.Location = new System.Drawing.Point(108, 154);
    206189      this.ischeckedCheckBox.Name = "ischeckedCheckBox";
    207       this.ischeckedCheckBox.Size = new System.Drawing.Size(15, 14);
     190      this.ischeckedCheckBox.Size = new System.Drawing.Size(18, 17);
    208191      this.ischeckedCheckBox.TabIndex = 26;
    209192      this.ischeckedCheckBox.UseVisualStyleBackColor = true;
    … …  
    216199      this.expressionInput.Location = new System.Drawing.Point(108, 19);
    217200      this.expressionInput.Name = "expressionInput";
    218       this.expressionInput.Size = new System.Drawing.Size(473, 20);
     201      this.expressionInput.Size = new System.Drawing.Size(473, 22);
    219202      this.expressionInput.TabIndex = 25;
    220203      //
    … …  
    224207      this.expressionLabel.Location = new System.Drawing.Point(8, 22);
    225208      this.expressionLabel.Name = "expressionLabel";
    226       this.expressionLabel.Size = new System.Drawing.Size(61, 13);
     209      this.expressionLabel.Size = new System.Drawing.Size(81, 17);
    227210      this.expressionLabel.TabIndex = 24;
    228211      this.expressionLabel.Text = "Expression:";
    229212      //
    230       // inclupperboundInput
    231       //
    232       this.inclupperboundInput.AutoSize = true;
    233       this.inclupperboundInput.Location = new System.Drawing.Point(108, 177);
    234       this.inclupperboundInput.Name = "inclupperboundInput";
    235       this.inclupperboundInput.Size = new System.Drawing.Size(15, 14);
    236       this.inclupperboundInput.TabIndex = 23;
    237       this.inclupperboundInput.UseVisualStyleBackColor = true;
    238       this.inclupperboundInput.CheckedChanged += new System.EventHandler(this.inclupperboundInput_CheckedChanged);
    239       //
    240       // incllowerboundInput
    241       //
    242       this.incllowerboundInput.AutoSize = true;
    243       this.incllowerboundInput.Location = new System.Drawing.Point(108, 153);
    244       this.incllowerboundInput.Name = "incllowerboundInput";
    245       this.incllowerboundInput.Size = new System.Drawing.Size(15, 14);
    246       this.incllowerboundInput.TabIndex = 22;
    247       this.incllowerboundInput.UseVisualStyleBackColor = true;
    248       this.incllowerboundInput.CheckedChanged += new System.EventHandler(this.incllowerboundInput_CheckedChanged);
    249       //
    250213      // errorProvider
    251214      //
    252215      this.errorProvider.ContainerControl = this;
    253216      this.errorProvider.RightToLeft = true;
    254       //
    255       // enabledLabel
    256       //
    257       this.enabledLabel.AutoSize = true;
    258       this.enabledLabel.Location = new System.Drawing.Point(8, 200);
    259       this.enabledLabel.Name = "enabledLabel";
    260       this.enabledLabel.Size = new System.Drawing.Size(49, 13);
    261       this.enabledLabel.TabIndex = 29;
    262       this.enabledLabel.Text = "Enabled:";
    263217      //
    264218      // IntervalConstraintView
    … …  
    278232    private System.Windows.Forms.Label lowerboundLabel;
    279233    private System.Windows.Forms.Label upperboundLabel;
    280     private System.Windows.Forms.Label incllowerboundLabel;
    281     private System.Windows.Forms.Label inclupperboundLabel;
    282234    private System.Windows.Forms.Label variableLabel;
    283235    private System.Windows.Forms.Label numberderivationLabel;
    … …  
    286238    private System.Windows.Forms.TextBox variableInput;
    287239    private System.Windows.Forms.GroupBox groupBox1;
    288     private System.Windows.Forms.CheckBox inclupperboundInput;
    289     private System.Windows.Forms.CheckBox incllowerboundInput;
    290240    private System.Windows.Forms.TextBox expressionInput;
    291241    private System.Windows.Forms.Label expressionLabel;

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

    r16936 r17370  
    6464      lowerboundInput.Enabled = Content != null && !Locked && !ReadOnly;
    6565      upperboundInput.Enabled = Content != null && !Locked && !ReadOnly;
    66       incllowerboundInput.Enabled = Content != null && !Locked && !ReadOnly;
    67       inclupperboundInput.Enabled = Content != null && !Locked && !ReadOnly;
    6866      ischeckedCheckBox.Enabled = Content != null && !Locked && !ReadOnly;
    6967    }
    … …  
    9997        lowerboundInput.Text = string.Empty;
    10098        upperboundInput.Text = string.Empty;
    101         incllowerboundInput.Checked = true;
    102         inclupperboundInput.Checked = true;
    10399        return;
    104100      }
    … …  
    107103      lowerboundInput.Text = Content.Interval.LowerBound.ToString();
    108104      upperboundInput.Text = Content.Interval.UpperBound.ToString();
    109       incllowerboundInput.Checked = Content.InclusiveLowerBound;
    110       inclupperboundInput.Checked = Content.InclusiveUpperBound;
     105
    111106      variableInput.Text = Content.Variable;
    112107      if (!Content.IsDerivation) {
    … …  
    177172    }
    178173
    179     private void incllowerboundInput_CheckedChanged(object sender, EventArgs e) {
    180         Content.InclusiveLowerBound = incllowerboundInput.Checked;
    181     }
    182 
    183     private void inclupperboundInput_CheckedChanged(object sender, EventArgs e) {
    184         Content.InclusiveUpperBound = inclupperboundInput.Checked;
    185     }
    186 
    187174    private void ischeckedCheckBox_CheckedChanged(object sender, EventArgs e) {
    188175        Content.Enabled = ischeckedCheckBox.Checked;
    … …  
    192179      if (numberderivationInput.SelectedItem == null) {
    193180        Content.NumberOfDerivation = 0;
     181        numberderivationInput.Enabled = false;
    194182        return;
    195183      }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.designer.cs

    r17250 r17370  
    143143                         "3. Add the keyword in" + Environment.NewLine +
    144144                         "4. Specify the interval with [lowerbound .. upperbound]" + Environment.NewLine +
    145                          "5. Open or closed square brackets denotes if an interval is open or closed" + Environment.NewLine + Environment.NewLine +
    146145                         "To define a derivation constraint: " + Environment.NewLine +
    147146                         "1. Start with d or \u2202" + Environment.NewLine +
    148147                         "2. Specify the target between '-characters" + Environment.NewLine +
    149                          "3. Seperate taget and derivation variable with /" + Environment.NewLine +
     148                         "3. Separate target and derivation variable with /" + Environment.NewLine +
    150149                         "4. Add derivation variable between '-characters'" + Environment.NewLine +
    151                          "5. Follow the steps 3-5 from above";
     150                         "5. Follow the steps 3-4 from above";
    152151      //
    153152      // intervalConstraintsView

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs

    r17368 r17370  
    7171    }
    7272
    73     public bool Contains(Interval other, bool lowerBoundInclusive = true, bool upperBoundInclusive = false) {
    74       if (double.IsNegativeInfinity(this.LowerBound) && double.IsPositiveInfinity(this.UpperBound))
    75         return true;
    76       //Left-unbounded and right-bounded:
    77       if (double.IsNegativeInfinity(this.LowerBound)) {
    78         if (upperBoundInclusive)
    79           return other.LowerBound <= this.UpperBound && other.UpperBound <= this.UpperBound;
    80         return other.LowerBound < this.UpperBound && other.UpperBound < this.UpperBound;
    81       }
    82 
    83       //Left-bounded and right-unbounded:
    84       if (double.IsPositiveInfinity(this.UpperBound)) {
    85         if (lowerBoundInclusive)
    86           return other.LowerBound >= this.LowerBound && other.UpperBound >= this.LowerBound;
    87         return other.LowerBound > this.LowerBound && other.UpperBound > this.LowerBound;
    88       }
    89 
    90       //Proper and bounded:
    91       //Closed:
    92       if (lowerBoundInclusive && upperBoundInclusive) {
    93         return this.LowerBound <= other.LowerBound && other.UpperBound <= this.UpperBound;
    94       }
    95 
    96       //Open:
    97       if (!lowerBoundInclusive && !upperBoundInclusive) {
    98         return this.LowerBound < other.LowerBound && other.UpperBound < this.UpperBound;
    99       }
    100 
    101       //Left-closed, right-open:
    102       if (lowerBoundInclusive) {
    103         return this.LowerBound <= other.LowerBound && other.UpperBound < this.UpperBound;
    104       }
    105 
    106       //Left-open, right-closed:
    107       return this.LowerBound < other.LowerBound && other.UpperBound <= this.UpperBound;
     73    public bool Contains(Interval other) {
     74      if (double.IsNegativeInfinity(LowerBound) && double.IsPositiveInfinity(UpperBound)) return true;
     75      if (other.LowerBound >= LowerBound && other.UpperBound <= UpperBound) return true;
     76 
     77      return false;
    10878    }
    10979

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraint.cs

    r16964 r17370  
    9898
    9999    [Storable]
    100     private bool inclusiveLowerBound;
    101     public bool InclusiveLowerBound {
    102       get => inclusiveLowerBound;
    103       set {
    104         if (inclusiveLowerBound == value) return;
    105         inclusiveLowerBound = value;
    106         UpdateExpression();
    107         OnChanged();
    108       }
    109     }
    110 
    111     [Storable]
    112     private bool inclusiveUpperBound;
    113     public bool InclusiveUpperBound {
    114       get => inclusiveUpperBound;
    115       set {
    116         if (inclusiveUpperBound == value) return;
    117         inclusiveUpperBound = value;
    118         UpdateExpression();
    119         OnChanged();
    120       }
    121     }
    122 
    123     [Storable]
    124100    private bool enabled;
    125101    public bool Enabled {
    … …  
    135111    private IntervalConstraint(StorableConstructorFlag _) : base(_) { }
    136112
    137     public IntervalConstraint(string expression, string variable, string target, int numberOfDerivation, Interval interval, bool inclusiveLowerBound,
    138       bool inclusiveUpperBound, bool enabled) : base(){
     113    public IntervalConstraint(string expression, string variable, string target, int numberOfDerivation, Interval interval, bool enabled) : base(){
    139114      this.expression = expression;
    140115      this.variable = variable;
    … …  
    142117      this.numberOfDerivation = numberOfDerivation;
    143118      this.interval = interval;
    144       this.inclusiveLowerBound = inclusiveLowerBound;
    145       this.inclusiveUpperBound = inclusiveUpperBound;
    146119      this.enabled = enabled;
    147120    }
    … …  
    158131      this.NumberOfDerivation = original.NumberOfDerivation;
    159132      this.Interval = original.Interval;
    160       this.InclusiveLowerBound = original.InclusiveLowerBound;
    161       this.InclusiveUpperBound = original.InclusiveUpperBound;
    162133      this.Enabled = original.Enabled;
    163134    }
    … …  
    189160        expression = string.Format("Target:{0} in {1}{2} .. {3}{4}",
    190161          Variable,
    191           (InclusiveLowerBound) ? "[" : "]",
     162          "[",
    192163          Interval?.LowerBound,
    193164          Interval?.UpperBound,
    194           (InclusiveUpperBound) ? "]" : "[");
     165          "]");
    195166        Expression = expression;
    196167        return;
    … …  
    199170        Variable,
    200171        Target,
    201         (InclusiveLowerBound) ? "[" : "]",
     172        "[",
    202173        Interval?.LowerBound,
    203174        Interval?.UpperBound,
    204         (InclusiveUpperBound) ? "]" : "[",
     175        "]",
    205176        GetDerivationString(numberOfDerivation));
    206177        Expression = expression;

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs

    r17250 r17370  
    3333      if (string.IsNullOrEmpty(target)) throw new ArgumentNullException("No target variable has been provided.");
    3434      if (variables == null) throw new ArgumentNullException("No variables have been provided.");
    35       if (!variables.Any()) throw new ArgumentException("Varialbes are empty.");
     35      if (!variables.Any()) throw new ArgumentException("Variables are empty.");
    3636
    3737      var lines = inputText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
    … …  
    4444          var targetConstraint = trimmedLine.Substring(start, end - start);
    4545          var match = Regex.Match(targetConstraint,
    46             @"(['](.*)[']|(.*[^\s]))\s*(\bin\b)\s*([\[\]])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\[\]])");
     46            @"(['](.*)[']|(.*[^\s]))\s*(\bin\b)\s*([\[])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\]])");
    4747          if (match.Success) {
    4848            if (match.Groups.Count != 10) {
    … …  
    6363              var parsedTarget = match.Groups[1].Value.Trim();
    6464              var variable = targetVariable;
    65               var inclLowerBound = match.Groups[5].Value.Trim() == "[";
    66               var inclUpperBound = match.Groups[9].Value.Trim() == "]";
    6765              var isEnabled = true;
    6866              var numberOfDerivation = 0;
    6967              var interval = new Interval(lowerBound, upperBound);
    7068
    71               var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
     69              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, isEnabled);
    7270
    7371              yield return constraint;
    … …  
    7977        } else if (trimmedLine.StartsWith("d") || trimmedLine.StartsWith("\u2202")) {
    8078          var match = Regex.Match(trimmedLine,
    81             @"([d∂])([²³]?)\s*(['](.*)[']|(.*[^\s]))\s*(\/)\s*([d∂])\s*(['](.*)[']|(.*[^\s²³]))\s*([²³]?)\s*\bin\b\s*([\[\]])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\[\]])");
     79            @"([d∂])([²³]?)\s*(['](.*)[']|(.*[^\s]))\s*(\/)\s*([d∂])\s*(['](.*)[']|(.*[^\s²³]))\s*([²³]?)\s*\bin\b\s*([\[])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\]])");
    8280
    8381          if (match.Success) {
    … …  
    115113              var parsedTarget = derivationTarget;
    116114              var isEnabled = true;
    117               var inclLowerBound = match.Groups[12].Value.Trim() == "[";
    118               var inclUpperBound = match.Groups[16].Value.Trim() == "]";
    119115              var variable = derivationVariable;
    120116              var numberOfDerivation = ParseDerivationCount(match.Groups[2].Value.Trim());
    121117              var interval = new Interval(lowerBound, upperBound);
    122118
    123               var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
     119              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, isEnabled);
    124120
    125121              yield return constraint;

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs

    r17256 r17370  
    3737                                                  "# Example for constraint on model parameter: " + Environment.NewLine +
    3838                                                  "d'y'/d'x' in [0 .. 10]" + Environment.NewLine +
    39                                                   "∂²'y'/∂'x'² in ]-1 .. inf.[";
     39                                                  "∂²'y'/∂'x'² in [-1 .. inf.]";
    4040
    4141    [Storable]
Note: See TracChangeset for help on using the changeset viewer.