Changeset 16308 for branches/2845_EnhancedProgress/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/ManhattanDistance.cs

Timestamp:

11/20/18 13:52:40 (5 years ago)

Author:

pfleck

Message:

#2845 reverted the last merge (r16307) because some revisions were missing

Location:

branches/2845_EnhancedProgress

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/ManhattanDistance.cs (modified) (3 diffs)

branches/2845_EnhancedProgress/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/ManhattanDistance.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
   [Item("ManhattanDistance", "A distance function that uses block distance")]
   public class ManhattanDistance : DistanceBase<IEnumerable<double>> {
+
     #region HLConstructors & Cloning
     [StorableConstructor]
@@ -44 +45 @@
     #endregion
 
-    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 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 override double Get(IEnumerable<double> a, IEnumerable<double> b) {
-      return GetDistance(a, b);
+      return GetDistance(a.ToArray(), b.ToArray());
     }
   }