Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/21/21 08:51:49 (2 years ago)
Author:
gkronber
Message:

#2994: push of old local changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/NLOptEvaluator.cs

    r17328 r18163  
    210210           constantOptimizationRows, ApplyLinearScalingParameter.ActualValue.Value, Solver,
    211211           out double qDiff, out double[] constraintsBefore, out double[] constraintsAfter,
    212            ConstantOptimizationIterations.Value, updateVariableWeights: UpdateVariableWeights, lowerEstimationLimit: EstimationLimitsParameter.ActualValue.Lower, upperEstimationLimit: EstimationLimitsParameter.ActualValue.Upper, updateConstantsInTree: UpdateConstantsInTree, counter: counter);
     212           ConstantOptimizationIterations.Value, updateVariableWeights: UpdateVariableWeights,
     213           lowerEstimationLimit: EstimationLimitsParameter.ActualValue.Lower, upperEstimationLimit: EstimationLimitsParameter.ActualValue.Upper,
     214           updateConstantsInTree: UpdateConstantsInTree, counter: counter);
    213215
    214216        AchievedQualityImprovementParameter.ActualValue = new DoubleValue(qDiff);
     
    272274      if (!updateConstantsInTree) throw new NotSupportedException("not updating tree parameters is not supported");
    273275      if (!applyLinearScaling) throw new NotSupportedException("application without linear scaling is not supported");
    274 
    275276
    276277      using (var state = new ConstrainedNLSInternal(solver, tree, maxIterations, problemData, 0, 0, 0)) {
     
    282283        if (constraintsAfter.Any(cv => cv > 1e-8)) qOpt = qBefore;
    283284        qDiff = qOpt - qBefore;
     285
     286        if(counter != null) {
     287          counter.FunctionEvaluations += state.NumObjectiveFunctionEvaluations;
     288          counter.GradientEvaluations += state.NumObjectiveGradientEvaluations;
     289        }
     290
    284291        return qOpt;
    285292      }
Note: See TracChangeset for help on using the changeset viewer.