Changeset 17214 for branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions

Timestamp:

08/13/19 19:02:36 (5 years ago)

Author:

gkronber

Message:

#2994: support for other NLOpt analysers, display trees for constraints for debugging

File:

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

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

@@ -11 +11 @@
 using HeuristicLab.Analysis;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Extensions {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [StorableType("676B237C-DD9C-4F24-B64F-D44B0FA1F6A6")]
   [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 120)]
@@ -66 +66 @@
       Parameters.Add(new FixedValueParameter<StringValue>(ModelStructureParameterName, "The function for which the parameters must be fit (only numeric constants are tuned).", new StringValue("1.0 * x*x + 0.0")));
       Parameters.Add(new FixedValueParameter<IntValue>(IterationsParameterName, "Determines how many iterations should be calculated while optimizing the constant of a symbolic expression tree (0 indicates other or default stopping criterion).", new IntValue(10)));
-      var validSolvers = new ItemSet<StringValue>(new[] { "MMA", "COBYLA", "CCSAQ", "ISRES" }.Select(s => new StringValue(s).AsReadOnly()));
+      var validSolvers = new ItemSet<StringValue>(new[] {
+        "MMA",
+        "COBYLA",
+        "CCSAQ",
+        "ISRES",
+        "DIRECT_G",
+        "NLOPT_GN_DIRECT_L",
+        "NLOPT_GN_DIRECT_L_RAND",
+        "NLOPT_GN_ORIG_DIRECT",
+        "NLOPT_GN_ORIG_DIRECT_L",
+        "NLOPT_GD_STOGO",
+        "NLOPT_GD_STOGO_RAND",
+        "NLOPT_LD_LBFGS_NOCEDAL",
+        "NLOPT_LD_LBFGS",
+        "NLOPT_LN_PRAXIS",
+        "NLOPT_LD_VAR1",
+        "NLOPT_LD_VAR2",
+        "NLOPT_LD_TNEWTON",
+        "NLOPT_LD_TNEWTON_RESTART",
+        "NLOPT_LD_TNEWTON_PRECOND",
+        "NLOPT_LD_TNEWTON_PRECOND_RESTART",
+        "NLOPT_GN_CRS2_LM",
+        "NLOPT_GN_MLSL",
+        "NLOPT_GD_MLSL",
+        "NLOPT_GN_MLSL_LDS",
+        "NLOPT_GD_MLSL_LDS",
+        "NLOPT_LN_NEWUOA",
+        "NLOPT_LN_NEWUOA_BOUND",
+        "NLOPT_LN_NELDERMEAD",
+        "NLOPT_LN_SBPLX",
+        "NLOPT_LN_AUGLAG",
+        "NLOPT_LD_AUGLAG",
+        "NLOPT_LN_BOBYQA",
+        "NLOPT_AUGLAG",
+        "NLOPT_LD_SLSQP",
+        "NLOPT_LD_CCSAQ",
+        "NLOPT_GN_ESCH",
+        "NLOPT_GN_AGS",
+      }.Select(s => new StringValue(s).AsReadOnly()));
       Parameters.Add(new ConstrainedValueParameter<StringValue>(SolverParameterName, "The solver algorithm", validSolvers, validSolvers.First()));
       Parameters.Add(new FixedValueParameter<DoubleValue>("FuncToleranceRel", new DoubleValue(0)));
@@ -135 +173 @@
       if (CheckGradient) state.CheckGradient = true;
       int idx = 0;
+      var formatter = new InfixExpressionFormatter();
       foreach(var constraintTree in state.constraintTrees) {
-        Results.AddOrUpdateResult($"Constraint {idx++}", constraintTree);
+        // HACK to remove parameter nodes which occurr multiple times
+        var reparsedTree = parser.Parse(formatter.Format(constraintTree));
+        Results.AddOrUpdateResult($"Constraint {idx++}", reparsedTree);
       }