Changeset 16924 for branches/2971_named_intervals

Timestamp:

05/08/19 15:51:16 (6 years ago)

Author:

chaider

Message:

#2971 Added isEnabled to constructor

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs (modified) (3 diffs)

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

@@ -60 +60 @@
 
       var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
-      var variableRanges = problemData.VariableRanges.getIntervals();
+      var variableRanges = problemData.VariableRanges.GetIntervals();
 
       var r2 = SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(interpreter, tree, problemData, problemData.TrainingIndices, applyLinearScaling, 10);

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

@@ -61 +61 @@
 
       var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
-      var variableRanges = problemData.VariableRanges.getIntervals();
+      var variableRanges = problemData.VariableRanges.GetIntervals();
       var tree = solution;
 

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

@@ -59 +59 @@
               var inclLowerBound = match.Groups[5].Value.Trim() == "[";
               var inclUpperBound = match.Groups[9].Value.Trim() == "]";
-              var isDerivation = false;
+              var isEnabled = true;
               var numberOfDerivation = 0;
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
+              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
 
               yield return constraint;
@@ -110 +110 @@
               var expression = match.Groups[0].Value;
               var parsedTarget = derivationTarget;
-              var isDerivation = true;
+              var isEnabled = true;
               var inclLowerBound = match.Groups[12].Value.Trim() == "[";
               var inclUpperBound = match.Groups[16].Value.Trim() == "]";
@@ -117 +117 @@
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
+              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
 
               yield return constraint;