Changeset 16774 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

04/10/19 16:46:46 (6 years ago)

Author:

chaider

Message:

#2971 Changed Parser and IntevalConstraint View

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Parser/IntervalConstraint.cs (modified) (2 diffs)
• Parser/IntervalConstraintsParser.cs (modified) (2 diffs)
• Regression/RegressionProblemData.cs (modified) (1 diff)

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

@@ -18 +18 @@
     public bool InclusiveUpperBound { get; set; }
     public bool IsDerivation { get; set; }
-    public string Variable { get; set; }
+
+    private string variable;
+    public string Variable {
+      get => variable;
+      set {
+        if (value != variable) {
+          variable = value;
+          OnChanged(EventArgs.Empty);
+        }
+      }
+    }
     public int NumberOfDerivation { get; set; }
 
@@ -53 +63 @@
       this.IsDerivation = original.IsDerivation;
       this.Variable = original.Variable;
-      this.NumberOfDerivation = NumberOfDerivation;
+      this.NumberOfDerivation = original.NumberOfDerivation;
     }
 

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

@@ -47 +47 @@
     }
 
+    
     public static IEnumerable<IntervalConstraint> ParseInput(string input, string target = "", IEnumerable<string> variables = null) {
       var lines = input.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
@@ -132 +133 @@
         } else if (trimmedLine.StartsWith("#") || trimmedLine == "") {
           //If it is a comment just continue without saving anything
-          //TODO maybe save comment too.
           continue;
         } else {

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

@@ -192 +192 @@
 
       Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
-      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(commentMessage, targetVariable, allowedInputVariables)));
+      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(commentMessage, this)));
       RegisterParameterEvents();
     }