removed MultiKernelMMD class, put in ComputeMMD class itself

shogun-toolbox · Jul 13, 2016 · 6816e7e · 6816e7e
1 parent fe8ee29
commit 6816e7e
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 103 deletions.
diff --git a/src/shogun/statistical_testing/MultiKernelQuadraticTimeMMD.cpp b/src/shogun/statistical_testing/MultiKernelQuadraticTimeMMD.cpp
@@ -37,7 +37,7 @@
 #include <shogun/statistical_testing/MultiKernelQuadraticTimeMMD.h>
 #include <shogun/statistical_testing/internals/FeaturesUtil.h>
 #include <shogun/statistical_testing/internals/KernelManager.h>
-#include <shogun/statistical_testing/internals/mmd/MultiKernelMMD.h>
+#include <shogun/statistical_testing/internals/mmd/ComputeMMD.h>
 #include <shogun/statistical_testing/internals/mmd/MultiKernelPermutationTest.h>
 
 using namespace shogun;
@@ -54,6 +54,7 @@ struct CMultiKernelQuadraticTimeMMD::Self
 	unique_ptr<CCustomDistance> m_pairwise_distance;
 	EDistanceType m_dtype;
 	KernelManager m_kernel_mgr;
+	ComputeMMD compute_mmd;
 };
 
 CMultiKernelQuadraticTimeMMD::Self::Self(CQuadraticTimeMMD *owner) : m_owner(owner),
@@ -158,8 +159,10 @@ SGVector<float64_t> CMultiKernelQuadraticTimeMMD::statistic(const KernelManager&
 	kernel_mgr.set_precomputed_distance(self->m_pairwise_distance.get());
 	SG_UNREF(distance);
 
-	MultiKernelMMD compute(nx, ny, stype);
-	SGVector<float64_t> result=compute(kernel_mgr);
+	self->compute_mmd.m_n_x=nx;
+   	self->compute_mmd.m_n_y=ny;
+   	self->compute_mmd.m_stype=stype;
+	SGVector<float64_t> result=self->compute_mmd(kernel_mgr);
 
 	kernel_mgr.unset_precomputed_distance();
 

diff --git a/src/shogun/statistical_testing/QuadraticTimeMMD.cpp b/src/shogun/statistical_testing/QuadraticTimeMMD.cpp
@@ -49,8 +49,6 @@
 #include <shogun/statistical_testing/internals/mmd/ComputeMMD.h>
 #include <shogun/statistical_testing/internals/mmd/FullDirect.h>
 #include <shogun/statistical_testing/internals/mmd/WithinBlockPermutationBatch.h>
-#include <shogun/statistical_testing/internals/mmd/MultiKernelMMD.h>
-#include <shogun/statistical_testing/internals/mmd/MultiKernelPermutationTest.h>
 #include <shogun/statistical_testing/kernelselection/KernelSelectionStrategy.h>
 
 using namespace shogun;

diff --git a/src/shogun/statistical_testing/internals/mmd/ComputeMMD.h b/src/shogun/statistical_testing/internals/mmd/ComputeMMD.h
@@ -32,9 +32,13 @@
 #define COMPUTE_MMD_H_
 
 #include <array>
+#include <vector>
 #include <shogun/io/SGIO.h>
 #include <shogun/lib/config.h>
+#include <shogun/lib/SGVector.h>
+#include <shogun/kernel/Kernel.h>
 #include <shogun/statistical_testing/MMD.h>
+#include <shogun/statistical_testing/internals/KernelManager.h>
 #include <shogun/mathematics/eigen3.h>
 
 namespace shogun
@@ -89,6 +93,33 @@ struct ComputeMMD
 		return static_cast<T>(compute(terms));
 	}
 
+	SGVector<float64_t> operator()(const KernelManager& kernel_mgr) const
+	{
+		ASSERT(m_n_x>0 && m_n_y>0);
+		std::vector<terms_t> terms(kernel_mgr.num_kernels());
+		const index_t size=m_n_x+m_n_y;
+		for (auto j=0; j<size; ++j)
+		{
+			for (auto i=j; i<size; ++i)
+			{
+				for (size_t k=0; k<kernel_mgr.num_kernels(); ++k)
+				{
+					auto kernel=kernel_mgr.kernel_at(k)->kernel(i, j);
+					add_term(terms[k], kernel, i, j);
+				}
+			}
+		}
+
+		SGVector<float64_t> result(kernel_mgr.num_kernels());
+		for (size_t k=0; k<kernel_mgr.num_kernels(); ++k)
+		{
+			result[k]=compute(terms[k]);
+			SG_SDEBUG("result[%d] = %f!\n", k, result[k]);
+		}
+		terms.resize(0);
+		return result;
+	}
+
 	template <typename T>
 	inline void add_term(terms_t& terms, T kernel_value, index_t i, index_t j) const
 	{

diff --git a/src/shogun/statistical_testing/internals/mmd/MultiKernelMMD.h b/src/shogun/statistical_testing/internals/mmd/MultiKernelMMD.h
diff --git a/tests/unit/statistical_testing/internals/MultiKernelMMD_unittest.cc b/tests/unit/statistical_testing/internals/MultiKernelMMD_unittest.cc
@@ -41,7 +41,7 @@
 #include <shogun/mathematics/eigen3.h>
 #include <shogun/statistical_testing/TwoDistributionTest.h>
 #include <shogun/statistical_testing/internals/KernelManager.h>
-#include <shogun/statistical_testing/internals/mmd/MultiKernelMMD.h>
+#include <shogun/statistical_testing/internals/mmd/ComputeMMD.h>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -88,7 +88,10 @@ TEST(MultiKernelMMD, biased_full)
 	auto distance=kernel_mgr.get_distance_instance();
 	kernel_mgr.set_precomputed_distance(test->compute_joint_distance(distance));
 
-	MultiKernelMMD tester(m, n, stype);
+	ComputeMMD tester;
+	tester.m_n_x=m;
+	tester.m_n_y=n;
+	tester.m_stype=stype;
 	SGVector<float64_t> values=tester(kernel_mgr);
 	kernel_mgr.unset_precomputed_distance();
 
@@ -150,7 +153,10 @@ TEST(MultiKernelMMD, unbiased_full)
 	auto distance=kernel_mgr.get_distance_instance();
 	kernel_mgr.set_precomputed_distance(test->compute_joint_distance(distance));
 
-	MultiKernelMMD tester(m, n, stype);
+	ComputeMMD tester;
+	tester.m_n_x=m;
+	tester.m_n_y=n;
+	tester.m_stype=stype;
 	SGVector<float64_t> values=tester(kernel_mgr);
 	kernel_mgr.unset_precomputed_distance();
 
@@ -212,7 +218,10 @@ TEST(MultiKernelMMD, unbiased_incomplete)
 	auto distance=kernel_mgr.get_distance_instance();
 	kernel_mgr.set_precomputed_distance(test->compute_joint_distance(distance));
 
-	MultiKernelMMD tester(m, n, stype);
+	ComputeMMD tester;
+	tester.m_n_x=m;
+	tester.m_n_y=n;
+	tester.m_stype=stype;
 	SGVector<float64_t> values=tester(kernel_mgr);
 	kernel_mgr.unset_precomputed_distance();