Changeset 16780

Timestamp:

04/15/19 08:53:12 (6 years ago)

Author:

chaider

Message:

#2971

• Added Target prefix for parsed onstraints in IntervalConstraintParser
• Added isChecked validation for constraints in ConstraintAnalyzer

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraintsParser.cs (modified) (1 diff)

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

@@ -87 +87 @@
     public static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicExpressionTree model,
       IRegressionProblemData problemData) {
-      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
+      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints.Where(x => x.IsChecked);
       var constraintViolations = new Dictionary<IntervalConstraint, bool>();
       var variableRanges = ((RegressionProblemData)problemData).VariableRanges.VariableIntervals;
@@ -147 +147 @@
       var constraintViolations = new Dictionary<string, int>();
 
-      var constraints = problemData.IntervalConstraintsParameter.Value.Constraints;
+      var constraints = problemData.IntervalConstraintsParameter.Value.Constraints.Where(x => x.IsChecked);
 
       if (dataTable.Rows.Count == 0) {

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

@@ -70 +70 @@
               var lowerBound = ParseIntervalBounds(match.Groups[4].Value);
               var upperBound = ParseIntervalBounds(match.Groups[6].Value);
-              var constraint = new IntervalConstraint(match.Groups[0].Value);
-              constraint.Expression = "Target " + match.Groups[0].Value;
+              var constraint = new IntervalConstraint("Target:" + match.Groups[0].Value);
+              constraint.Expression = "Target:" + match.Groups[0].Value;
               constraint.Definition = "Target " + match.Groups[1].Value.Trim();
               constraint.Variable = match.Groups[1].Value.Trim();