From a697aabc67519c05cc478c0202bbd52e618b5a64 Mon Sep 17 00:00:00 2001
From: Sergey Lisitsyn <lisitsyn.s.o@gmail.com>
Date: Thu, 14 Mar 2013 21:53:57 +0400
Subject: [PATCH] Hopefully last update of tapkee before release

---
 .../routines/multidimensional_scaling.hpp     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/shogun/lib/tapkee/routines/multidimensional_scaling.hpp b/src/shogun/lib/tapkee/routines/multidimensional_scaling.hpp
index 8d29cca3808..7e40d794003 100644
--- a/src/shogun/lib/tapkee/routines/multidimensional_scaling.hpp
+++ b/src/shogun/lib/tapkee/routines/multidimensional_scaling.hpp
@@ -67,16 +67,18 @@ EmbeddingResult triangulate(RandomAccessIterator begin, RandomAccessIterator end
 {
 	timed_context context("Landmark triangulation");
 	
-	bool* to_process = new bool[end-begin];
-	fill(to_process,to_process+(end-begin),true);
+	const IndexType n_vectors = end-begin;
+	const IndexType n_landmarks = landmarks.size();
+
+	bool* to_process = new bool[n_vectors];
+	fill(to_process,to_process+n_vectors,true);
 	
-	DenseMatrix embedding((end-begin),target_dimension);
+	DenseMatrix embedding(n_vectors,target_dimension);
 
-	for (Landmarks::const_iterator iter=landmarks.begin(); 
-			iter!=landmarks.end(); ++iter)
+	for (IndexType index_iter=0; index_iter<n_landmarks; ++index_iter)
 	{
-		to_process[*iter] = false;
-		embedding.row(*iter).noalias() = landmarks_embedding.first.row(iter-landmarks.begin());
+		to_process[landmarks[index_iter]] = false;
+		embedding.row(landmarks[index_iter]).noalias() = landmarks_embedding.first.row(index_iter);
 	}
 
 	for (IndexType i=0; i<target_dimension; ++i)
@@ -85,15 +87,15 @@ EmbeddingResult triangulate(RandomAccessIterator begin, RandomAccessIterator end
 #pragma omp parallel shared(begin,end,to_process,distance_callback,landmarks, \
 		landmarks_embedding,landmark_distances_squared,embedding) default(none)
 	{
-		DenseVector distances_to_landmarks = DenseVector(landmarks.size());
+		DenseVector distances_to_landmarks(n_landmarks);
 		IndexType index_iter;
 #pragma omp for nowait
-		for (index_iter=0; index_iter<IndexType(end-begin); ++index_iter)
+		for (index_iter=0; index_iter<n_vectors; ++index_iter)
 		{
 			if (!to_process[index_iter])
 				continue;
 
-			for (IndexType i=0; i<distances_to_landmarks.size(); ++i)
+			for (IndexType i=0; i<n_landmarks; ++i)
 			{
 				ScalarType d = distance_callback(begin[index_iter],begin[landmarks[i]]);
 				distances_to_landmarks(i) = d*d;