Changeset 15614 for branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances

Timestamp:

01/15/18 08:21:48 (7 years ago)

Author:

bwerth

Message:

#2847 made changes to M5 according to review comments

Location:

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.4 (modified) (1 prop)
• 3.4/TSNE/Distances/CosineDistance.cs (modified) (4 diffs)
• 3.4/TSNE/Distances/DistanceBase.cs (modified) (3 diffs)
• 3.4/TSNE/Distances/EuclideanDistance.cs (modified) (1 diff)
• 3.4/TSNE/Distances/ManhattanDistance.cs (modified) (2 diffs)
• 3.4/TSNE/Distances/WeightedEuclideanDistance.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/WeightedEuclideanDistance.cs)

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/CosineDistance.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +27 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-
   /// <summary>
   /// The angular distance as defined as a normalized distance measure dependent on the angle between two vectors.
@@ -35 +33 @@
   [Item("CosineDistance", "The angular distance as defined as a normalized distance measure dependent on the angle between two vectors.")]
   public class CosineDistance : DistanceBase<IEnumerable<double>> {
-
     #region HLConstructors & Cloning
     [StorableConstructor]
@@ -48 +45 @@
 
     #region statics
-    public static double GetDistance(IReadOnlyList<double> point1, IReadOnlyList<double> point2) {
-      if (point1.Count != point2.Count) throw new ArgumentException("Cosine distance not defined on vectors of different length");
-      var innerprod = 0.0;
-      var length1 = 0.0;
-      var length2 = 0.0;
-
-      for (var i = 0; i < point1.Count; i++) {
-        double d1 = point1[i], d2 = point2[i];
-        innerprod += d1 * d2;
-        length1 += d1 * d1;
-        length2 += d2 * d2;
+    public static double GetDistance(IEnumerable<double> point1, IEnumerable<double> point2) {
+      using (IEnumerator<double> p1Enum = point1.GetEnumerator(), p2Enum = point2.GetEnumerator()) {
+        var innerprod = 0.0;
+        var length1 = 0.0;
+        var length2 = 0.0;
+        while (p1Enum.MoveNext() & p2Enum.MoveNext()) {
+          double d1 = p1Enum.Current, d2 = p2Enum.Current;
+          innerprod += d1 * d2;
+          length1 += d1 * d1;
+          length2 += d2 * d2;
+        }
+        var divisor = Math.Sqrt(length1 * length2);
+        if (divisor.IsAlmost(0)) throw new ArgumentException("Cosine distance is not defined on vectors of length 0");
+        if (p1Enum.MoveNext() || p2Enum.MoveNext()) throw new ArgumentException("Cosine distance not defined on vectors of different length");
+        return 1 - innerprod / divisor;
       }
-      var l = Math.Sqrt(length1 * length2);
-      if (l.IsAlmost(0)) throw new ArgumentException("Cosine distance is not defined on vectors of length 0");
-      return 1 - innerprod / l;
     }
     #endregion
     public override double Get(IEnumerable<double> a, IEnumerable<double> b) {
-      return GetDistance(a.ToArray(), b.ToArray());
+      return GetDistance(a, b);
     }
   }

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

@@ -29 +29 @@
   [StorableClass]
   public abstract class DistanceBase<T> : Item, IDistance<T> {
-
     #region HLConstructors & Cloning
     [StorableConstructor]
@@ -44 +43 @@
 
     public double Get(object x, object y) {
-      return Get((T)x, (T)y);
+      return Get((T) x, (T) y);
     }
 
     public IComparer GetDistanceComparer(object item) {
-      return new DistanceComparer((T)item, this);
+      return new DistanceComparer((T) item, this);
     }
 
-    private class DistanceComparer : IComparer<T>, IComparer {
+    internal class DistanceComparer : IComparer<T>, IComparer {
       private readonly T item;
       private readonly IDistance<T> dist;
@@ -65 +64 @@
 
       public int Compare(object x, object y) {
-        return Compare((T)x, (T)y);
+        return Compare((T) x, (T) y);
       }
     }

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/EuclideanDistance.cs

@@ -31 +31 @@
   [Item("EuclideanDistance", "A norm function that uses Euclidean distance")]
   public class EuclideanDistance : DistanceBase<IEnumerable<double>> {
-
     #region HLConstructors & Cloning
     [StorableConstructor]
     protected EuclideanDistance(bool deserializing) : base(deserializing) { }
     protected EuclideanDistance(EuclideanDistance original, Cloner cloner) : base(original, cloner) { }
-    public override IDeepCloneable Clone(Cloner cloner) { return new EuclideanDistance(this, cloner); }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new EuclideanDistance(this, cloner);
+    }
     public EuclideanDistance() { }
     #endregion
 
-    public static double GetDistance(IReadOnlyList<double> point1, IReadOnlyList<double> point2) {
-      if (point1.Count != point2.Count) throw new ArgumentException("Euclidean distance not defined on vectors of different length");
-      var sum = 0.0;
-      for (var i = 0; i < point1.Count; i++) {
-        var d = point1[i] - point2[i];
-        sum += d * d;
+    public static double GetDistance(IEnumerable<double> point1, IEnumerable<double> point2) {
+      using (IEnumerator<double> p1Enum = point1.GetEnumerator(), p2Enum = point2.GetEnumerator()) {
+        var sum = 0.0;
+        while (p1Enum.MoveNext() & p2Enum.MoveNext()) {
+          var d = p1Enum.Current - p2Enum.Current;
+          sum += d * d;
+        }
+        if (p1Enum.MoveNext() || p2Enum.MoveNext()) throw new ArgumentException("Euclidean distance not defined on vectors of different length");
+        return Math.Sqrt(sum);
       }
-
-      return Math.Sqrt(sum);
     }
 
     public override double Get(IEnumerable<double> a, IEnumerable<double> b) {
-      return GetDistance(a.ToArray(), b.ToArray());
+      return GetDistance(a, b);
     }
   }

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/ManhattanDistance.cs

@@ -31 +31 @@
   [Item("ManhattanDistance", "A distance function that uses block distance")]
   public class ManhattanDistance : DistanceBase<IEnumerable<double>> {
-
     #region HLConstructors & Cloning
     [StorableConstructor]
@@ -45 +44 @@
     #endregion
 
-    public static double GetDistance(double[] point1, double[] point2) {
-      if (point1.Length != point2.Length) throw new ArgumentException("Manhattan distance not defined on vectors of different length");
-      var sum = 0.0;
-      for (var i = 0; i < point1.Length; i++)
-        sum += Math.Abs(point1[i] + point2[i]);
-      return sum;
+    public static double GetDistance(IEnumerable<double> point1, IEnumerable<double> point2) {
+      using (IEnumerator<double> p1Enum = point1.GetEnumerator(), p2Enum = point2.GetEnumerator()) {
+        var sum = 0.0;
+        while (p1Enum.MoveNext() & p2Enum.MoveNext())
+          sum += Math.Abs(p1Enum.Current - p2Enum.Current);
+        if (p1Enum.MoveNext() || p2Enum.MoveNext()) throw new ArgumentException("Manhattan distance not defined on vectors of different length");
+        return sum;
+      }
     }
 
     public override double Get(IEnumerable<double> a, IEnumerable<double> b) {
-      return GetDistance(a.ToArray(), b.ToArray());
+      return GetDistance(a, b);
     }
   }