added more tests, fixed more bugs

shogun-toolbox · Jul 4, 2016 · 736d8f7 · 736d8f7
1 parent 2fd310f
commit 736d8f7
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 530 deletions.
diff --git a/src/shogun/statistical_testing/QuadraticTimeMMD.cpp b/src/shogun/statistical_testing/QuadraticTimeMMD.cpp
@@ -442,7 +442,7 @@ SGVector<float64_t> CQuadraticTimeMMD::spectrum_sample_null()
 	 * K is matrix for XX, L is matrix for YY, KL is XY, LK is YX
 	 * works since X and Y are concatenated here */
 	SGMatrix<float64_t> precomputed_km=self->get_kernel_matrix();
-	SGMatrix<float64_t> K(precomputed_km.matrix, precomputed_km.num_rows, precomputed_km.num_cols);
+	SGMatrix<float64_t> K(precomputed_km.num_rows, precomputed_km.num_cols);
 	std::copy(precomputed_km.matrix, precomputed_km.matrix+precomputed_km.num_rows*precomputed_km.num_cols, K.matrix);
 
 	/* center matrix K=H*K*H */

diff --git a/src/shogun/statistical_testing/internals/mmd/UnbiasedIncomplete.cpp b/src/shogun/statistical_testing/internals/mmd/UnbiasedIncomplete.cpp
@@ -45,7 +45,7 @@ float64_t UnbiasedIncomplete::operator()(SGMatrix<float64_t> km)
 	Block& b_xy = map.block(n, 0, n, n);
 	auto term_3 = b_xy.sum() - b_xy.diagonal().sum();
 
-	auto statistic = term_1/n/(n-1) + term_2/n/(n-1) - 2*term_3/n/n;
+	auto statistic = term_1/n/(n-1) + term_2/n/(n-1) - 2*term_3/n/(n-1);
 
 	return statistic;