Changeset 14911 for trunk

Timestamp:

05/03/17 09:20:21 (8 years ago)

Author:

gkronber

Message:

#2699: copied kernel ridge regression from branch to trunk

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (2 diffs)
• KernelRidgeRegression (copied) (copied from branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression)
• TSNE/Distances/DistanceBase.cs (modified) (3 diffs)
• TSNE/Distances/ManhattanDistance.cs (copied) (copied from branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/ManhattanDistance.cs)
• TSNE/Interfaces/IDistance.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -240 +240 @@
     <Compile Include="Interfaces\ISupportVectorMachineSolution.cs" />
     <Compile Include="Interfaces\IDataAnalysisAlgorithm.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\CicularKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\GaussianKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\IKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\InverseMultiquadraticKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\KernelBase.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\MultiquadraticKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\PolysplineKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelFunctions\ThinPlatePolysplineKernel.cs" />
+    <Compile Include="KernelRidgeRegression\KernelRidgeRegression.cs" />
+    <Compile Include="KernelRidgeRegression\KernelRidgeRegressionModel.cs" />
     <Compile Include="kMeans\KMeansClustering.cs" />
     <Compile Include="kMeans\KMeansClusteringModel.cs" />
@@ -325 +335 @@
     <Compile Include="TSNE\Distances\IndexedItemDistance.cs" />
     <Compile Include="TSNE\Distances\InnerProductDistance.cs" />
+    <Compile Include="TSNE\Distances\ManhattanDistance.cs" />
     <Compile Include="TSNE\Interfaces\IDistance.cs" />
     <Compile Include="TSNE\Interfaces\ISpacePartitioningTree.cs" />

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DistanceBase.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections;
 using System.Collections.Generic;
 using HeuristicLab.Common;
@@ -42 +43 @@
     }
 
-    private class DistanceComparer : IComparer<T> {
+
+    public double Get(object x, object y) {
+      return Get((T)x, (T)y);
+    }
+
+    public IComparer GetDistanceComparer(object item) {
+      return new DistanceComparer((T)item, this);
+    }
+
+    private class DistanceComparer : IComparer<T>, IComparer {
       private readonly T item;
       private readonly IDistance<T> dist;
@@ -54 +64 @@
         return dist.Get(x, item).CompareTo(dist.Get(y, item));
       }
+
+      public int Compare(object x, object y) {
+        return Compare((T)x, (T)y);
+      }
     }
   }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Interfaces/IDistance.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections;
 using System.Collections.Generic;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  public interface IDistance<in T> : IItem {
+  public interface IDistance<in T> : IItem, IDistance {
     /// <summary>
     /// Calculates a distance measure between two objects.
@@ -41 +42 @@
     IComparer<T> GetDistanceComparer(T item);
   }
+
+
+  public interface IDistance : IItem {
+    double Get(object x, object y);
+    IComparer GetDistanceComparer(object item);
+  }
 }