Changeset 17786 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs

Timestamp:

12/01/20 09:19:42 (3 years ago)

Author:

pfleck

Message:

#3040 Worked in DiffSharp for constant-opt.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (8 diffs)

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

@@ -42 +42 @@
     private const string FunctionEvaluationsResultParameterName = "Constants Optimization Function Evaluations";
     private const string GradientEvaluationsResultParameterName = "Constants Optimization Gradient Evaluations";
+    private const string HessianEvaluationsResultParameterName = "Constants Optimization Hessian Evaluations";
     private const string CountEvaluationsParameterName = "Count Function and Gradient Evaluations";
 
@@ -66 +67 @@
     public IResultParameter<IntValue> GradientEvaluationsResultParameter {
       get { return (IResultParameter<IntValue>)Parameters[GradientEvaluationsResultParameterName]; }
+    }
+    public IResultParameter<IntValue> HessianEvaluationsResultParameter {
+      get { return (IResultParameter<IntValue>)Parameters[HessianEvaluationsResultParameterName]; }
     }
     public IFixedValueParameter<BoolValue> CountEvaluationsParameter {
@@ -116 +120 @@
       Parameters.Add(new ResultParameter<IntValue>(FunctionEvaluationsResultParameterName, "The number of function evaluations performed by the constants optimization evaluator", "Results", new IntValue()));
       Parameters.Add(new ResultParameter<IntValue>(GradientEvaluationsResultParameterName, "The number of gradient evaluations performed by the constants optimization evaluator", "Results", new IntValue()));
+      Parameters.Add(new ResultParameter<IntValue>(HessianEvaluationsResultParameterName, "The number of hessian evaluations performed by the constants optimization evaluator", "Results", new IntValue()));
     }
 
@@ -132 +137 @@
       if (!Parameters.ContainsKey(GradientEvaluationsResultParameterName))
         Parameters.Add(new ResultParameter<IntValue>(GradientEvaluationsResultParameterName, "The number of gradient evaluations performed by the constants optimization evaluator", "Results", new IntValue()));
+      if (!Parameters.ContainsKey(HessianEvaluationsResultParameterName))
+        Parameters.Add(new ResultParameter<IntValue>(HessianEvaluationsResultParameterName, "The number of hessian evaluations performed by the constants optimization evaluator", "Results", new IntValue()));
     }
 
@@ -164 +171 @@
             FunctionEvaluationsResultParameter.ActualValue.Value += counter.FunctionEvaluations;
             GradientEvaluationsResultParameter.ActualValue.Value += counter.GradientEvaluations;
+            HessianEvaluationsResultParameter.ActualValue.Value += counter.HessianEvaluations;
           }
         }
@@ -184 +192 @@
       FunctionEvaluationsResultParameter.ExecutionContext = context;
       GradientEvaluationsResultParameter.ExecutionContext = context;
+      HessianEvaluationsResultParameter.ExecutionContext = context;
 
       // Pearson R² evaluator is used on purpose instead of the const-opt evaluator, 
@@ -195 +204 @@
       FunctionEvaluationsResultParameter.ExecutionContext = null;
       GradientEvaluationsResultParameter.ExecutionContext = null;
+      HessianEvaluationsResultParameter.ExecutionContext = null;
 
       return r2;
@@ -206 +216 @@
       public int FunctionEvaluations = 0;
       public int GradientEvaluations = 0;
+      public int HessianEvaluations = 0;
     }
   }