Changeset 16463 for branches/2974_Constants_Optimization

Timestamp:

12/28/18 17:57:13 (6 years ago)

Author:

mkommend

Message:

#2974: Adapted tree to autodiff converter.

File:

• branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs (modified) (2 diffs)

branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs

@@ -133 +133 @@
     public static bool TryConvertToAutoDiff(ISymbolicExpressionTree tree, bool makeVariableWeightsVariable, bool addLinearScalingTerms, Dictionary<DataForVariable, AutoDiff.Variable> parameters,
       out ParametricFunction func,
-      out ParametricFunctionGradient func_grad
+      out ParametricFunctionGradient func_grad,
+      out double[] initialConstants
   ) {
-
       // use a transformator object which holds the state (variable list, parameter list, ...) for recursive transformation of the tree
       var transformator = new TreeToAutoDiffTermConverter(makeVariableWeightsVariable, parameters);
       AutoDiff.Term term;
       try {
-        term = transformator.ConvertToAutoDiff(tree.Root.GetSubtree(0));
+
 
         if (addLinearScalingTerms) {
@@ -146 +146 @@
           var alpha = new AutoDiff.Variable();
           var beta = new AutoDiff.Variable();
-          transformator.variables.Insert(0, alpha);
-          transformator.variables.Insert(0, beta);
-
+          transformator.variables.Add(beta);
+          transformator.variables.Add(alpha);
+          term = transformator.ConvertToAutoDiff(tree.Root.GetSubtree(0));
           term = term * alpha + beta;
-        }
-        
-        var compiledTerm = term.Compile(transformator.variables.ToArray(), parameters.Select(kvp => kvp.Value).ToArray());
-
-
+        } else {
+          term = transformator.ConvertToAutoDiff(tree.Root.GetSubtree(0));
+        }
+
+        var compiledTerm = term.Compile(transformator.variables.ToArray(), parameters.Values.ToArray());
         func = (vars, @params) => compiledTerm.Evaluate(vars, @params);
         func_grad = (vars, @params) => compiledTerm.Differentiate(vars, @params);
+        initialConstants = transformator.initialConstants.ToArray();
+
         return true;
       } catch (ConversionException) {
         func = null;
         func_grad = null;
+        initialConstants = null;
       }
       return false;