Changeset 15479 for branches/Weighted TSNE/3.4/TSNE/Distances/EuclideanDistance.cs

Timestamp:

11/20/17 15:29:53 (6 years ago)

Author:

bwerth

Message:

#2850 worked on weighted tSNE

File:

• branches/Weighted TSNE/3.4/TSNE/Distances/EuclideanDistance.cs (modified) (1 diff)

branches/Weighted TSNE/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;
+        var p1Next = p1Enum.MoveNext();
+        var p2Next = p2Enum.MoveNext();
+        while (p1Next && p2Next) {
+          var d = p1Enum.Current - p2Enum.Current;
+          sum += d * d;
+          p1Next = p1Enum.MoveNext();
+          p2Next = p1Enum.MoveNext();
+        }
+        if (p2Next || p1Next) 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);
     }
   }