Changeset 15480 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

11/20/17 20:36:29 (7 years ago)

Author:

gkronber

Message:

#2852: moved the scaling parameters to the end of the parameter vector to be able to remove the c.Skip(2).ToArray() call and removed unnecessary .ToArray() calls

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs

@@ -251 +251 @@
       if (node.Symbol is StartSymbol) {
         if (addLinearScalingTerms) {
+          var t = ConvertToAutoDiff(node.GetSubtree(0));
+          // scaling variables α, β are given at the end of the parameter vector
           var alpha = new AutoDiff.Variable();
           var beta = new AutoDiff.Variable();
           variables.Add(beta);
           variables.Add(alpha);
-          return ConvertToAutoDiff(node.GetSubtree(0)) * alpha + beta;
+          return t * alpha + beta;
         } else return ConvertToAutoDiff(node.GetSubtree(0));
       }