Changeset 14872 for branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE

Timestamp:

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

Author:

gkronber

Message:

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

Location:

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE

Files:

• Distances/DistanceBase.cs (modified) (3 diffs)
• Interfaces/IDistance.cs (modified) (2 diffs)

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DistanceBase.cs

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

branches/RBFRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Interfaces/IDistance.cs

@@ -19 +19 @@
  */
 #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> : IDistance {
     /// <summary>
     /// Calculates a distance measure between two objects.
@@ -41 +41 @@
     IComparer<T> GetDistanceComparer(T item);
   }
+
+  public interface IDistance : IItem {
+    double Get(object x, object y);
+    IComparer GetDistanceComparer(object item);
+  }
 }