Changeset 8375 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/BFGSMakeStep.cs

Timestamp:

08/01/12 13:46:17 (12 years ago)

Author:

gkronber

Message:

#1902 implemented Gaussian process regression operators and analyzers

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/BFGSMakeStep.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/BFGSMakeStep.cs

@@ -35 +35 @@
   public sealed class BFGSMakeStep : SingleSuccessorOperator {
     private const string TerminationCriterionParameterName = "TerminationCriterion";
-    private const string HyperparameterParameterName = "Hyperparameter";
+    private const string PointParameterName = "Point";
     private const string BFGSStateParameterName = "BFGSState";
 
@@ -45 +45 @@
       get { return (ILookupParameter<BoolValue>)Parameters[TerminationCriterionParameterName]; }
     }
-    public ILookupParameter<DoubleArray> HyperparameterParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters[HyperparameterParameterName]; }
+    public ILookupParameter<DoubleArray> PointParameter {
+      get { return (ILookupParameter<DoubleArray>)Parameters[PointParameterName]; }
     }
     #endregion
@@ -52 +52 @@
 
     #region Properties
-    public BFGSState BFGSState { get { return BFGSStateParameter.ActualValue; } }
+    private BFGSState BFGSState { get { return BFGSStateParameter.ActualValue; } }
     #endregion
 
@@ -64 +64 @@
       // out
       Parameters.Add(new LookupParameter<BoolValue>(TerminationCriterionParameterName, "The termination criterion indicating that the BFGS optimization algorithm should stop."));
-      Parameters.Add(new LookupParameter<DoubleArray>(HyperparameterParameterName, "The parameters of the function to optimize."));
+      Parameters.Add(new LookupParameter<DoubleArray>(PointParameterName, "The next point that should be evaluated in the BFGS algorithm."));
     }
 
@@ -73 +73 @@
     public override IOperation Apply() {
       var state = BFGSState;
-      bool stop = alglib.minlbfgs.minlbfgsiteration(state.State);
-      TerminationCriterionParameter.ActualValue = new BoolValue(stop);
-      if (!stop) {
-        HyperparameterParameter.ActualValue = new DoubleArray(state.State.x);
+      bool @continue = alglib.minlbfgs.minlbfgsiteration(state.State);
+      TerminationCriterionParameter.ActualValue = new BoolValue(!@continue);
+      if (@continue) {
+        PointParameter.ActualValue = new DoubleArray(state.State.x);
       } else {
         double[] x = new double[state.State.x.Length];
         alglib.minlbfgs.minlbfgsreport rep = new alglib.minlbfgs.minlbfgsreport();
         alglib.minlbfgs.minlbfgsresults(state.State, ref x, rep);
-        HyperparameterParameter.ActualValue = new DoubleArray(x);
+        PointParameter.ActualValue = new DoubleArray(x);
       }
       return base.Apply();