Changeset 15169 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

07/07/17 14:12:44 (7 years ago)

Author:

bwerth

Message:

#2699 made KernelParameter a ConstrainedValueParameter; added some description to BetaParameter

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelRidgeRegression.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelRidgeRegression.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -57 +58 @@
 
     #region parameter properties
-    public ValueParameter<IKernel> KernelParameter {
-      get { return (ValueParameter<IKernel>)Parameters[KernelParameterName]; }
+    public IConstrainedValueParameter<IKernel> KernelParameter {
+      get { return (IConstrainedValueParameter<IKernel>)Parameters[KernelParameterName]; }
     }
 
@@ -102 +103 @@
     public KernelRidgeRegression() {
       Problem = new RegressionProblem();
-      Parameters.Add(new ValueParameter<IKernel>(KernelParameterName, "The kernel", new GaussianKernel()));
+      var values = new ItemSet<IKernel>(ApplicationManager.Manager.GetInstances<IKernel>());
+      Parameters.Add(new ConstrainedValueParameter<IKernel>(KernelParameterName, "The kernel", values, values.OfType<GaussianKernel>().FirstOrDefault()));
       Parameters.Add(new FixedValueParameter<BoolValue>(ScaleInputVariablesParameterName, "Set to true if the input variables should be scaled to the interval [0..1]", new BoolValue(true)));
       Parameters.Add(new FixedValueParameter<DoubleValue>(LambdaParameterName, "The log10-transformed weight for the regularization term lambda [-inf..+inf]. Small values produce more complex models, large values produce models with larger errors. Set to very small value (e.g. -1.0e15) for almost exact approximation", new DoubleValue(-2)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>(BetaParameterName, "The beta parameter for the kernel", new DoubleValue(2)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>(BetaParameterName, "The inverse width of the kernel ]0..+inf]. The distance between points is divided by this value before beeing plugged into the kernel.", new DoubleValue(2)));
     }