Merge pull request #440 from iglesias/knn-covertree

Minor bugfixes in KNN
shogun-toolbox · Apr 11, 2012 · 2d37d40 · 2d37d40
2 parents a27e1ae + 873ff2c
commit 2d37d40
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/shogun/classifier/KNN.cpp b/src/shogun/classifier/KNN.cpp
@@ -154,14 +154,14 @@ CLabels* CKNN::apply()
 			 "it for classification\n");
 
 	int32_t num_lab=distance->get_num_vec_rhs();
-	ASSERT(m_k<=num_lab);
+	ASSERT(m_k<=distance->get_num_vec_lhs());
 
 	CLabels* output=new CLabels(num_lab);
 
-	float64_t* dists;
-	int32_t* train_lab;
+	float64_t* dists   = NULL;
+	int32_t* train_lab = NULL;
 	//vector of neighbors used for the cover tree support
-	int32_t* nearest_neighbors;
+	int32_t* nearest_neighbors = NULL;
 	//distances to train data and working buffer of train_labels
 	if ( ! m_use_covertree )
 	{