Changeset 15249 for stable/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DistanceBase.cs

Timestamp:

07/15/17 10:29:40 (7 years ago)

Author:

gkronber

Message:

#2699,#2700
merged r14862, r14863, r14911, r14936, r15156, r15157, r15158, r15164, r15169, r15207:15209, r15225, r15227, r15234, r15248 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE)
• HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DistanceBase.cs (modified) (4 diffs)

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DistanceBase.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections;
 using System.Collections.Generic;
 using HeuristicLab.Common;
@@ -29 +30 @@
   public abstract class DistanceBase<T> : Item, IDistance<T> {
 
-    #region HLConstructors & Boilerplate
+    #region HLConstructors & Cloning
     [StorableConstructor]
     protected DistanceBase(bool deserializing) : base(deserializing) { }
@@ -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 +63 @@
         return dist.Get(x, item).CompareTo(dist.Get(y, item));
       }
+
+      public int Compare(object x, object y) {
+        return Compare((T)x, (T)y);
+      }
     }
   }