Changeset 14892

Timestamp:

04/26/17 12:23:36 (7 years ago)

Author:

gkronber

Message:

#2699: made some adjustments after bwerth's changes (mainly formatting)

Location:

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• GaussianProcess/GaussianProcessRegression.cs (modified) (2 diffs)
• KernelRidgeRegression/KernelFunctions/CicularKernel.cs (modified) (1 diff)
• KernelRidgeRegression/KernelFunctions/PolysplineKernel.cs (modified) (1 diff)
• KernelRidgeRegression/KernelFunctions/ThinPlatePolysplineKernel.cs (modified) (1 diff)
• KernelRidgeRegression/KernelRidgeRegressionModel.cs (modified) (3 diffs)

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegression.cs

@@ -42 +42 @@
 
     public override Type ProblemType { get { return typeof(IRegressionProblem); } }
-    public new IRegressionProblem Problem
-    {
+    public new IRegressionProblem Problem {
       get { return (IRegressionProblem)base.Problem; }
       set { base.Problem = value; }
@@ -53 +52 @@
 
     #region parameter properties
-    public IConstrainedValueParameter<IGaussianProcessRegressionModelCreator> GaussianProcessModelCreatorParameter
-    {
+    public IConstrainedValueParameter<IGaussianProcessRegressionModelCreator> GaussianProcessModelCreatorParameter {
       get { return (IConstrainedValueParameter<IGaussianProcessRegressionModelCreator>)Parameters[ModelCreatorParameterName]; }
     }
-    public IFixedValueParameter<GaussianProcessRegressionSolutionCreator> GaussianProcessSolutionCreatorParameter
-    {
+    public IFixedValueParameter<GaussianProcessRegressionSolutionCreator> GaussianProcessSolutionCreatorParameter {
       get { return (IFixedValueParameter<GaussianProcessRegressionSolutionCreator>)Parameters[SolutionCreatorParameterName]; }
     }
-    public IFixedValueParameter<BoolValue> CreateSolutionParameter
-    {
+    public IFixedValueParameter<BoolValue> CreateSolutionParameter {
       get { return (IFixedValueParameter<BoolValue>)Parameters[CreateSolutionParameterName]; }
     }
     #endregion
     #region properties
-    public bool CreateSolution
-    {
+    public bool CreateSolution {
       get { return CreateSolutionParameter.Value.Value; }
       set { CreateSolutionParameter.Value.Value = value; }

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelFunctions/CicularKernel.cs

@@ -45 +45 @@
     protected override double Get(double norm) {
       var beta = Beta.Value;
-      if (Math.Abs(Beta.Value) < double.Epsilon) return double.NaN;
-      if (norm >= Beta.Value) return 0;
+      if (Math.Abs(beta) < double.Epsilon) return double.NaN;
+      if (norm >= beta) return 0;
       var d = norm / beta;
       return 2 * Math.PI * (Math.Acos(-d) - d * Math.Sqrt(1 - d * d));

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelFunctions/PolysplineKernel.cs

@@ -37 +37 @@
     #endregion
     #region Parameterproperties
-    public IFixedValueParameter<DoubleValue> DegreeParameter
-    {
+    public IFixedValueParameter<DoubleValue> DegreeParameter {
       get { return Parameters[DegreeParameterName] as IFixedValueParameter<DoubleValue>; }
     }
     #endregion
     #region Properties
-    public DoubleValue Degree
-    {
+    public DoubleValue Degree {
       get { return DegreeParameter.Value; }
     }

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelFunctions/ThinPlatePolysplineKernel.cs

@@ -37 +37 @@
     #endregion
     #region Parameterproperties
-    public IFixedValueParameter<DoubleValue> DegreeParameter
-    {
+    public IFixedValueParameter<DoubleValue> DegreeParameter {
       get { return Parameters[DegreeParameterName] as IFixedValueParameter<DoubleValue>; }
     }
     #endregion
     #region Properties
-    public DoubleValue Degree
-    {
+    public DoubleValue Degree {
       get { return DegreeParameter.Value; }
     }

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelRidgeRegressionModel.cs

@@ -32 +32 @@
   [Item("KernelRidgeRegressionModel", "A kernel ridge regression model")]
   public sealed class KernelRidgeRegressionModel : RegressionModel {
-    public override IEnumerable<string> VariablesUsedForPrediction
-    {
+    public override IEnumerable<string> VariablesUsedForPrediction {
       get { return allowedInputVariables; }
     }
@@ -39 +38 @@
     [Storable]
     private readonly string[] allowedInputVariables;
-    public string[] AllowedInputVariables
-    {
+    public string[] AllowedInputVariables {
       get { return allowedInputVariables; }
     }
@@ -148 +146 @@
         }
         LooCvRMSE = Math.Sqrt(ssqLooError / n);
-      }
-      catch (alglib.alglibexception ae) {
+      } catch (alglib.alglibexception ae) {
         // wrap exception so that calling code doesn't have to know about alglib implementation
         throw new ArgumentException("There was a problem in the calculation of the kernel ridge regression model", ae);