Changeset 17325 for branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/NLOptEvaluator.cs

Timestamp:

10/09/19 11:13:11 (5 years ago)

Author:

gkronber

Message:

#2994: worked on ConstrainedNLS

File:

• branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/NLOptEvaluator.cs (modified) (2 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/NLOptEvaluator.cs

@@ -199 +199 @@
     }
 
-    private static void GetParameterNodes(ISymbolicExpressionTree tree, out List<ISymbolicExpressionTreeNode> thetaNodes, out List<double> thetaValues) {
-      thetaNodes = new List<ISymbolicExpressionTreeNode>();
-      thetaValues = new List<double>();
-
-      var nodes = tree.IterateNodesPrefix().ToArray();
-      for (int i = 0; i < nodes.Length; ++i) {
-        var node = nodes[i];
-        if (node is VariableTreeNode variableTreeNode) {
-          thetaValues.Add(variableTreeNode.Weight);
-          thetaNodes.Add(node);
-        } else if (node is ConstantTreeNode constantTreeNode) {
-          thetaNodes.Add(node);
-          thetaValues.Add(constantTreeNode.Value);
-        }
-      }
-    }
-
 
     public static double OptimizeConstants(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter,
@@ -230 +213 @@
 
       using (var state = new ConstrainedNLSInternal(solver, tree, maxIterations, problemData, 0, 0, 0)) {
-        state.Optimize();
+        state.Optimize(ConstrainedNLSInternal.OptimizationMode.UpdateParameters);
         return state.BestError;
       }