Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/22 13:28:56 (19 months ago)
Author:
pfleck
Message:

#3040 Updated to newer TensorFlow.NET version.

  • Removed IL Merge from TensorFlow.NET.
  • Temporarily removed DiffSharp.
  • Changed to a locally built Attic with a specific Protobuf version that is compatible with TensorFlow.NET. (Also adapted other versions of nuget dependencies.)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

    r18238 r18239  
    4747      nudLearningRate.Enabled = tree != null && TensorFlowConstantOptimizationEvaluator.CanOptimizeConstants(tree);
    4848      btnUnrollingVectorOptimizeConstants.Enabled = tree != null && VectorUnrollingNonlinearLeastSquaresConstantOptimizationEvaluator.CanOptimizeConstants(tree);
     49#if INCLUDE_DIFFSHARP
    4950      btnDiffSharpOptimizeConstants.Enabled = tree != null && NonlinearLeastSquaresVectorConstantOptimizationEvaluator.CanOptimizeConstants(tree);
     51#endif
    5052    }
    5153
     
    9597      return TensorFlowConstantOptimizationEvaluator.OptimizeTree(tree, regressionProblemData,
    9698        regressionProblemData.TrainingIndices,
    97         applyLinearScaling: true, updateVariableWeights: true, maxIterations: maxIterations, learningRate: learningRate,
     99        //new int[]{ 0, 1 },
     100        applyLinearScaling: false, updateVariableWeights: true, maxIterations: maxIterations, learningRate: learningRate,
    98101        cancellationToken: cancellationToken,
    99102        progress: new SynchronousProgress<double>(cost => {
     
    121124        tree = VectorUnrollingNonlinearLeastSquaresConstantOptimizationEvaluator.OptimizeTree(
    122125          tree, interpreter,
    123           regressionProblemData, regressionProblemData.TrainingIndices,
    124           applyLinearScaling: true, maxIterations: constOptIterations, updateVariableWeights: true,
     126          regressionProblemData,
     127          regressionProblemData.TrainingIndices,
     128          //new int[] { 0, 1 },
     129          applyLinearScaling: false, maxIterations: constOptIterations, updateVariableWeights: true,
    125130          cancellationToken: cancellationToken, iterationCallback: (args, func, obj) => {
    126131            double newProgressValue = progress.ProgressValue + (1.0 / (constOptIterations + 2) / maxRepetitions); // (constOptIterations + 2) iterations are reported
     
    150155      int reps = 0;
    151156
     157#if INCLUDE_DIFFSHARP
    152158      do {
    153159        prevResult = result;
     
    166172               progress.ProgressState != ProgressState.StopRequested &&
    167173               progress.ProgressState != ProgressState.CancelRequested);
     174#endif
    168175      return tree;
    169176    }
Note: See TracChangeset for help on using the changeset viewer.