Changeset 14872 for branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/RadialBasisFunctions/KernelFunctions/KernelBase.cs

Timestamp:

04/14/17 17:53:30 (7 years ago)

Author:

gkronber

Message:

#2699: made a number of changes mainly to RBF regression model

File:

• branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/RadialBasisFunctions/KernelFunctions/KernelBase.cs (modified) (8 diffs)

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/RadialBasisFunctions/KernelFunctions/KernelBase.cs

@@ -31 +31 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [StorableClass]
-  public abstract class KernelBase<T> : ParameterizedNamedItem, IKernelFunction<T> {
+  public abstract class KernelBase : ParameterizedNamedItem, ICovarianceFunction {
 
     #region Parameternames
@@ -38 +38 @@
     #endregion
     #region Parameterproperties
-    public ValueParameter<IDistance<T>> DistanceParameter
-    {
-      get { return Parameters[DistanceParameterName] as ValueParameter<IDistance<T>>; }
+    public ValueParameter<IDistance> DistanceParameter {
+      get { return Parameters[DistanceParameterName] as ValueParameter<IDistance>; }
     }
 
-    public IFixedValueParameter<DoubleValue> BetaParameter
-    {
+    public IFixedValueParameter<DoubleValue> BetaParameter {
       get { return Parameters[BetaParameterName] as FixedValueParameter<DoubleValue>; }
     }
@@ -50 +48 @@
     #endregion
     #region Properties
-    public IDistance<T> Distance
-    {
+    public IDistance Distance {
       get { return DistanceParameter.Value; }
     }
 
-    public double Beta
-    {
+    public double Beta {
       get { return BetaParameter.Value.Value; }
     }
@@ -62 +58 @@
     #endregion
 
-    #region HLConstructors & Boilerplate
     [StorableConstructor]
     protected KernelBase(bool deserializing) : base(deserializing) { }
@@ -68 +63 @@
     private void AfterDeserialization() { }
 
-    protected KernelBase(KernelBase<T> original, Cloner cloner)
+    protected KernelBase(KernelBase original, Cloner cloner)
       : base(original, cloner) { }
 
     protected KernelBase() {
-      Parameters.Add(new ValueParameter<IDistance<T>>(DistanceParameterName, "The distance function used for kernel calculation"));
-      DistanceParameter.Value = new EuclidianDistance() as IDistance<T>;
+      Parameters.Add(new ValueParameter<IDistance>(DistanceParameterName, "The distance function used for kernel calculation"));
+      DistanceParameter.Value = new EuclideanDistance();
     }
-    #endregion
 
-    public double Get(T a, T b) {
+    public double Get(object a, object b) {
       return Get(Distance.Get(a, b));
     }
@@ -93 +87 @@
     public ParameterizedCovarianceFunction GetParameterizedCovarianceFunction(double[] p, int[] columnIndices) {
       if (p == null || p.Length != 1) throw new ArgumentException("Illegal parametrization");
-      var myClone = (KernelBase<T>)Clone(new Cloner());
+      var myClone = (KernelBase)Clone(new Cloner());
       myClone.BetaParameter.Value.Value = p[0];
       var cov = new ParameterizedCovarianceFunction {
@@ -107 +101 @@
     protected double GetNorm(double[,] x, double[,] xt, int i, int j, int[] columnIndices) {
       var dist = Distance as IDistance<IEnumerable<double>>;
-      if (dist == null) throw new ArgumentException("The Distance needs to apply to double-Vectors");
+      if (dist == null) throw new ArgumentException("The distance needs to apply to double vectors");
       var r1 = new IndexedEnumerable(x, i, columnIndices);
       var r2 = new IndexedEnumerable(xt, j, columnIndices);
@@ -142 +136 @@
       }
 
-      public double Current
-      {
+      public double Current {
         get { return data[row, column.Current]; }
       }
 
-      object IEnumerator.Current
-      {
-        get
-        {
+      object IEnumerator.Current {
+        get {
           return data[row, column.Current];
         }