Changeset 15353 for branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs

Timestamp:

09/07/17 15:32:26 (7 years ago)

Author:

pfleck

Message:

#1666:

• Changed Progress interface (single parameterless ctor, overloads for Start-method).
• Passed Impact-Calculator per ctor argument instead of virtual properties.
• Created virtual OptimizeConstants-method instead of making the button-click event-handler virtual.

File:

• branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (2 diffs)

branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs

@@ -156 +156 @@
       int maxIterations, bool updateVariableWeights = true,
       double lowerEstimationLimit = double.MinValue, double upperEstimationLimit = double.MaxValue,
-      bool updateConstantsInTree = true, Action<double[], double, int> iterationReport = null) {
+      bool updateConstantsInTree = true, Action<double[], double, object> iterationCallback = null) {
 
       // numeric constants in the tree become variables for constant opt
@@ -210 +210 @@
       alglib.ndimensional_pfunc function_cx_1_func = CreatePFunc(func);
       alglib.ndimensional_pgrad function_cx_1_grad = CreatePGrad(func_grad);
-
-      int i = 0;
-      var xrep = new alglib.ndimensional_rep((a, f, o) => {
-        if (iterationReport != null) iterationReport(a, f, i++);
-      });
+      alglib.ndimensional_rep xrep = null;
+      if (iterationCallback != null)
+        xrep = new alglib.ndimensional_rep(iterationCallback);
 
       try {
         alglib.lsfitcreatefg(x, y, c, n, m, k, false, out state);
         alglib.lsfitsetcond(state, 0.0, 0.0, maxIterations);
-        alglib.lsfitsetxrep(state, iterationReport != null);
+        alglib.lsfitsetxrep(state, iterationCallback != null);
         //alglib.lsfitsetgradientcheck(state, 0.001);
         alglib.lsfitfit(state, function_cx_1_func, function_cx_1_grad, xrep, null);