Merge pull request #3543 from sudk1896/sgvec

Replace pointer and vlen with SGVector in QDA.

src/shogun/multiclass/QDA.cpp

@@ -127,23 +127,21 @@ CMulticlassLabels* CQDA::apply_multiclass(CFeatures* data)
 	VectorXd norm2(num_vecs*m_num_classes);
 	norm2.setZero();
 
-	int32_t vlen;
-	bool vfree;
-	float64_t* vec;
+	SGVector<float64_t> vec;
 	for (int k = 0; k < m_num_classes; k++)
 	{
 		// X = features - means
 		for (int i = 0; i < num_vecs; i++)
 		{
-			vec = rf->get_feature_vector(i, vlen, vfree);
-			ASSERT(vec)
+			vec = rf->get_feature_vector(i);
+			ASSERT(vec.vector)
 
-			Map< VectorXd > Evec(vec,vlen);
+			Map< VectorXd > Evec(vec, vec.vlen);
 			Map< VectorXd > Em_means_col(m_means.get_column_vector(k), m_dim);
 
 			X.row(i) = Evec - Em_means_col;
 
-			rf->free_feature_vector(vec, i, vfree);
+			rf->free_feature_vector(vec, i);
 		}
 
 		Map< MatrixXd > Em_M(m_M.get_matrix(k), m_dim, m_dim);
@@ -253,23 +251,21 @@ bool CQDA::train_machine(CFeatures* data)
 
 	m_means.zero();
 
-	int32_t vlen;
-	bool vfree;
-	float64_t* vec;
+	SGVector<float64_t> vec;
 	for (int k = 0; k < m_num_classes; k++)
 	{
 		MatrixXd buffer(class_nums[k], m_dim);
 		Map< VectorXd > Em_means(m_means.get_column_vector(k), m_dim);
 		for (int i = 0; i < class_nums[k]; i++)
 		{
-			vec = rf->get_feature_vector(class_idxs[k*num_vec + i], vlen, vfree);
-			ASSERT(vec)
+			vec = rf->get_feature_vector(class_idxs[k*num_vec + i]);
+			ASSERT(vec.vector)
 
-			Map< VectorXd > Evec(vec, vlen);
+			Map< VectorXd > Evec(vec, vec.vlen);
 			Em_means += Evec;
 			buffer.row(i) = Evec;
 
-			rf->free_feature_vector(vec, class_idxs[k*num_vec + i], vfree);
+			rf->free_feature_vector(vec, class_idxs[k*num_vec + i]);
 		}
 
 		Em_means /= class_nums[k];