Changeset 16924


Ignore:
Timestamp:
05/08/19 15:51:16 (3 months ago)
Author:
chaider
Message:

#2971 Added isEnabled to constructor

Location:
branches/2971_named_intervals
Files:
3 edited

Legend:

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

    r16921 r16924  
    6060
    6161      var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
    62       var variableRanges = problemData.VariableRanges.getIntervals();
     62      var variableRanges = problemData.VariableRanges.GetIntervals();
    6363
    6464      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

    r16921 r16924  
    6161
    6262      var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
    63       var variableRanges = problemData.VariableRanges.getIntervals();
     63      var variableRanges = problemData.VariableRanges.GetIntervals();
    6464      var tree = solution;
    6565
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs

    r16903 r16924  
    5959              var inclLowerBound = match.Groups[5].Value.Trim() == "[";
    6060              var inclUpperBound = match.Groups[9].Value.Trim() == "]";
    61               var isDerivation = false;
     61              var isEnabled = true;
    6262              var numberOfDerivation = 0;
    6363              var interval = new Interval(lowerBound, upperBound);
    6464
    65               var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
     65              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
    6666
    6767              yield return constraint;
     
    110110              var expression = match.Groups[0].Value;
    111111              var parsedTarget = derivationTarget;
    112               var isDerivation = true;
     112              var isEnabled = true;
    113113              var inclLowerBound = match.Groups[12].Value.Trim() == "[";
    114114              var inclUpperBound = match.Groups[16].Value.Trim() == "]";
     
    117117              var interval = new Interval(lowerBound, upperBound);
    118118
    119               var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
     119              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
    120120
    121121              yield return constraint;
Note: See TracChangeset for help on using the changeset viewer.