Changeset 16603 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/OdeParameterIdentification.cs

Timestamp:

02/13/19 16:04:10 (5 years ago)

Author:

gkronber

Message:

#2925: scaling of residuals to target variance and update constant values directly in the tree

File:

• branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/OdeParameterIdentification.cs (modified) (1 diff)

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/OdeParameterIdentification.cs

@@ -189 +189 @@
       problem.Analyze(new[] { ind }, new[] { quality }, Results, rand);
     }
-
-    // private ISymbolicExpressionTree Convert(ISymbolicExpressionTree tree) {
-    //   return new SymbolicExpressionTree(Convert(tree.Root));
-    // }
-
-
-    // for translation from symbolic expressions to simple symbols
-    // private static Dictionary<Type, string> sym2str = new Dictionary<Type, string>() {
-    //   {typeof(Addition), "+" },
-    //   {typeof(Subtraction), "-" },
-    //   {typeof(Multiplication), "*" },
-    //   {typeof(Sine), "sin" },
-    //   {typeof(Cosine), "cos" },
-    //   {typeof(Square), "sqr" },
-    // };
-
-    // private ISymbolicExpressionTreeNode Convert(ISymbolicExpressionTreeNode node) {
-    //   if (sym2str.ContainsKey(node.Symbol.GetType())) {
-    //     var children = node.Subtrees.Select(st => Convert(st)).ToArray();
-    //     return Make(sym2str[node.Symbol.GetType()], children);
-    //   } else if (node.Symbol is ProgramRootSymbol) {
-    //     var child = Convert(node.GetSubtree(0));
-    //     node.RemoveSubtree(0);
-    //     node.AddSubtree(child);
-    //     return node;
-    //   } else if (node.Symbol is StartSymbol) {
-    //     var child = Convert(node.GetSubtree(0));
-    //     node.RemoveSubtree(0);
-    //     node.AddSubtree(child);
-    //     return node;
-    //   } else if (node.Symbol is Division) {
-    //     var children = node.Subtrees.Select(st => Convert(st)).ToArray();
-    //     if (children.Length == 1) {
-    //       return Make("%", new[] { new SimpleSymbol("θ", 0).CreateTreeNode(), children[0] });
-    //     } else if (children.Length != 2) throw new ArgumentException("Division is not supported for multiple arguments");
-    //     else return Make("%", children);
-    //   } else if (node.Symbol is Constant) {
-    //     return new SimpleSymbol("θ", 0).CreateTreeNode();
-    //   } else if (node.Symbol is DataAnalysis.Symbolic.Variable) {
-    //     var varNode = node as VariableTreeNode;
-    //     if (!varNode.Weight.IsAlmost(1.0)) throw new ArgumentException("Variable weights are not supported");
-    //     return new SimpleSymbol(varNode.VariableName, 0).CreateTreeNode();
-    //   } else throw new ArgumentException("Unsupported symbol: " + node.Symbol.Name);
-    // }
-
-    // private ISymbolicExpressionTreeNode Make(string op, ISymbolicExpressionTreeNode[] children) {
-    //   if (children.Length == 1) {
-    //     var s = new SimpleSymbol(op, 1).CreateTreeNode();
-    //     s.AddSubtree(children.First());
-    //     return s;
-    //   } else {
-    //     var s = new SimpleSymbol(op, 2).CreateTreeNode();
-    //     var c0 = children[0];
-    //     var c1 = children[1];
-    //     s.AddSubtree(c0);
-    //     s.AddSubtree(c1);
-    //     for (int i = 2; i < children.Length; i++) {
-    //       var sn = new SimpleSymbol(op, 2).CreateTreeNode();
-    //       sn.AddSubtree(s);
-    //       sn.AddSubtree(children[i]);
-    //       s = sn;
-    //     }
-    //     return s;
-    //   }
-    // }
     #endregion
   }