Changeset 15487

Timestamp:

11/27/17 10:22:08 (6 years ago)

Author:

bwerth

Message:

#2850 reenabled backwards compatibility; fixed distances

Location:

branches/Weighted TSNE/3.4/TSNE

Files:

• Distances/CosineDistance.cs (modified) (1 diff)
• Distances/DistanceBase.cs (modified) (3 diffs)
• Distances/EuclideanDistance.cs (modified) (1 diff)
• Distances/ManhattanDistance.cs (modified) (1 diff)
• Distances/WeightedEuclideanDistance.cs (modified) (1 diff)
• TSNEAlgorithm.cs (modified) (1 diff)

branches/Weighted TSNE/3.4/TSNE/Distances/CosineDistance.cs

@@ -50 +50 @@
         var length1 = 0.0;
         var length2 = 0.0;
-        var p1Next = p1Enum.MoveNext();
-        var p2Next = p2Enum.MoveNext();
-        while (p1Next && p2Next) {
+        while (p1Enum.MoveNext() & p2Enum.MoveNext()) {
           double d1 = p1Enum.Current, d2 = p2Enum.Current;
           innerprod += d1 * d2;
           length1 += d1 * d1;
           length2 += d2 * d2;
-          p1Next = p1Enum.MoveNext();
-          p2Next = p1Enum.MoveNext();
         }
         var divisor = Math.Sqrt(length1 * length2);
         if (divisor.IsAlmost(0)) throw new ArgumentException("Cosine distance is not defined on vectors of length 0");
-        if (p2Next || p1Next) throw new ArgumentException("Cosine distance not defined on vectors of different length");
+        if (p1Enum.MoveNext() || p2Enum.MoveNext()) throw new ArgumentException("Cosine distance not defined on vectors of different length");
         return 1 - innerprod / divisor;
       }

branches/Weighted TSNE/3.4/TSNE/Distances/DistanceBase.cs

@@ -28 +28 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [StorableClass]
-  public abstract class DistanceBase<T> : ParameterizedNamedItem, IDistance<T> {
-
+  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);
     }
 
@@ -65 +64 @@
 
       public int Compare(object x, object y) {
-        return Compare((T)x, (T)y);
+        return Compare((T) x, (T) y);
       }
     }

branches/Weighted TSNE/3.4/TSNE/Distances/EuclideanDistance.cs

@@ -44 +44 @@
       using (IEnumerator<double> p1Enum = point1.GetEnumerator(), p2Enum = point2.GetEnumerator()) {
         var sum = 0.0;
-        var p1Next = p1Enum.MoveNext();
-        var p2Next = p2Enum.MoveNext();
-        while (p1Next && p2Next) {
+        while (p1Enum.MoveNext() & p2Enum.MoveNext()) {
           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");
+        if (p1Enum.MoveNext() || p2Enum.MoveNext()) throw new ArgumentException("Euclidean distance not defined on vectors of different length");
         return Math.Sqrt(sum);
       }

branches/Weighted TSNE/3.4/TSNE/Distances/ManhattanDistance.cs

@@ -47 +47 @@
       using (IEnumerator<double> p1Enum = point1.GetEnumerator(), p2Enum = point2.GetEnumerator()) {
         var sum = 0.0;
-        var p1Next = p1Enum.MoveNext();
-        var p2Next = p2Enum.MoveNext();
-        while (p1Next && p2Next) {
+        while (p1Enum.MoveNext() & p2Enum.MoveNext())
           sum += Math.Abs(p1Enum.Current - p2Enum.Current);
-          p1Next = p1Enum.MoveNext();
-          p2Next = p1Enum.MoveNext();
-        }
-        if (p2Next || p1Next) throw new ArgumentException("Manhattan distance not defined on vectors of different length");
+        if (p1Enum.MoveNext() || p2Enum.MoveNext()) throw new ArgumentException("Manhattan distance not defined on vectors of different length");
         return sum;
       }

branches/Weighted TSNE/3.4/TSNE/Distances/WeightedEuclideanDistance.cs

@@ -65 +65 @@
       using (IEnumerator<double> p1Enum = point1.GetEnumerator(), p2Enum = point2.GetEnumerator(), weEnum = weights.GetEnumerator()) {
         var sum = 0.0;
-        var p1Next = p1Enum.MoveNext();
-        var p2Next = p2Enum.MoveNext();
-        var weNext = weEnum.MoveNext();
-        while (p1Next && p2Next && weNext) {
+        while (p1Enum.MoveNext() & p2Enum.MoveNext() & weEnum.MoveNext()) {
           var d = p1Enum.Current - p2Enum.Current;
           var w = weEnum.Current;
           sum += d * d * w * w;
-          p1Next = p1Enum.MoveNext();
-          p2Next = p2Enum.MoveNext();
-          weNext = weEnum.MoveNext();
         }
-        if (weNext) throw new ArgumentException("Weighted Euclidean distance requires a non-null weight vector of length equal to the number of allowed input double variables the compared points");
-        if (p1Next || p2Next) throw new ArgumentException("Weighted Euclidean distance not defined on vectors of different length");
+        if (weEnum.MoveNext() || p1Enum.MoveNext() || p2Enum.MoveNext()) throw new ArgumentException("Weighted Euclidean distance not defined on vectors of different length");
         return Math.Sqrt(sum);
       }

branches/Weighted TSNE/3.4/TSNE/TSNEAlgorithm.cs

@@ -299 +299 @@
 
         if (Normalization) data = NormalizeInputData(data);
-        state = TSNEStatic<double[]>.CreateState(data, DistanceFunction, random, NewDimensions, Perplexity, Theta, StopLyingIteration, MomentumSwitchIteration, InitialMomentum, FinalMomentum, Eta, RandomInitialization);
+        var randomInit = Parameters.ContainsKey(RandomInitializationParameterName) ? RandomInitialization : true;
+        state = TSNEStatic<double[]>.CreateState(data, DistanceFunction, random, NewDimensions, Perplexity, Theta, StopLyingIteration, MomentumSwitchIteration, InitialMomentum, FinalMomentum, Eta, randomInit);
         SetUpResults(allindices);
         iter = 0;