added convenient constructor

shogun-toolbox · Jul 1, 2016 · 656b51e · 656b51e
1 parent 45b50ed
commit 656b51e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/shogun/statistical_testing/LinearTimeMMD.cpp b/src/shogun/statistical_testing/LinearTimeMMD.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <shogun/io/SGIO.h>
 #include <shogun/lib/SGMatrix.h>
 #include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/Statistics.h>
@@ -30,14 +31,22 @@ CLinearTimeMMD::CLinearTimeMMD() : CMMD()
 {
 }
 
+CLinearTimeMMD::CLinearTimeMMD(CFeatures* samples_from_p, CFeatures* samples_from_q) : CMMD()
+{
+	set_p(samples_from_p);
+	set_q(samples_from_q);
+}
+
 CLinearTimeMMD::~CLinearTimeMMD()
 {
 }
 
 void CLinearTimeMMD::set_num_blocks_per_burst(index_t num_blocks_per_burst)
 {
-	get_data_manager().set_blocksize(get_data_manager().get_min_blocksize());
-	get_data_manager().set_num_blocks_per_burst(num_blocks_per_burst);
+	auto& dm=get_data_manager();
+	dm.set_blocksize(get_data_manager().get_min_blocksize());
+	dm.set_num_blocks_per_burst(num_blocks_per_burst);
+	SG_SDEBUG("Block contains %d and %d samples, from P and Q respectively!\n", dm.blocksize_at(0), dm.blocksize_at(1));
 }
 
 const std::function<float32_t(SGMatrix<float32_t>)> CLinearTimeMMD::get_direct_estimation_method() const

diff --git a/src/shogun/statistical_testing/LinearTimeMMD.h b/src/shogun/statistical_testing/LinearTimeMMD.h
@@ -29,6 +29,7 @@ class CLinearTimeMMD : public CMMD
 	using operation=std::function<float32_t(SGMatrix<float32_t>)>;
 public:
 	CLinearTimeMMD();
+	CLinearTimeMMD(CFeatures* samples_from_p, CFeatures* samples_from_q);
 	virtual ~CLinearTimeMMD();
 
 	void set_num_blocks_per_burst(index_t num_blocks_per_burst);