Changeset 18239 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

Timestamp:

03/22/22 13:28:56 (2 years 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:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs (modified) (5 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

@@ -47 +47 @@
       nudLearningRate.Enabled = tree != null && TensorFlowConstantOptimizationEvaluator.CanOptimizeConstants(tree);
       btnUnrollingVectorOptimizeConstants.Enabled = tree != null && VectorUnrollingNonlinearLeastSquaresConstantOptimizationEvaluator.CanOptimizeConstants(tree);
+#if INCLUDE_DIFFSHARP
       btnDiffSharpOptimizeConstants.Enabled = tree != null && NonlinearLeastSquaresVectorConstantOptimizationEvaluator.CanOptimizeConstants(tree);
+#endif
     }
 
@@ -95 +97 @@
       return TensorFlowConstantOptimizationEvaluator.OptimizeTree(tree, regressionProblemData,
         regressionProblemData.TrainingIndices,
-        applyLinearScaling: true, updateVariableWeights: true, maxIterations: maxIterations, learningRate: learningRate,
+        //new int[]{ 0, 1 },
+        applyLinearScaling: false, updateVariableWeights: true, maxIterations: maxIterations, learningRate: learningRate,
         cancellationToken: cancellationToken,
         progress: new SynchronousProgress<double>(cost => {
@@ -121 +124 @@
         tree = VectorUnrollingNonlinearLeastSquaresConstantOptimizationEvaluator.OptimizeTree(
           tree, interpreter,
-          regressionProblemData, regressionProblemData.TrainingIndices,
-          applyLinearScaling: true, maxIterations: constOptIterations, updateVariableWeights: true,
+          regressionProblemData,
+          regressionProblemData.TrainingIndices,
+          //new int[] { 0, 1 },
+          applyLinearScaling: false, maxIterations: constOptIterations, updateVariableWeights: true,
           cancellationToken: cancellationToken, iterationCallback: (args, func, obj) => {
             double newProgressValue = progress.ProgressValue + (1.0 / (constOptIterations + 2) / maxRepetitions); // (constOptIterations + 2) iterations are reported
@@ -150 +155 @@
       int reps = 0;
 
+#if INCLUDE_DIFFSHARP
       do {
         prevResult = result;
@@ -166 +172 @@
                progress.ProgressState != ProgressState.StopRequested &&
                progress.ProgressState != ProgressState.CancelRequested);
+#endif
       return tree;
     }