Added sgmatrix constructor for the CustomDistance

shogun-toolbox · Dec 3, 2011 · 2fedc4d · 2fedc4d
1 parent b2b1573
commit 2fedc4d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/shogun/distance/CustomDistance.cpp b/src/shogun/distance/CustomDistance.cpp
@@ -63,6 +63,15 @@ CCustomDistance::CCustomDistance(CDistance* d) : CDistance()
 	dummy_init(num_rows, num_cols);
 }
 
+CCustomDistance::CCustomDistance(const SGMatrix<float64_t> distance_matrix)
+: CDistance()
+{
+	init();
+	set_full_distance_matrix_from_full(distance_matrix.matrix,
+	                                   distance_matrix.num_rows,
+	                                   distance_matrix.num_cols);
+}
+
 CCustomDistance::CCustomDistance(const float64_t* dm, int32_t rows, int32_t cols)
 : CDistance() 
 {

diff --git a/src/shogun/distance/CustomDistance.h b/src/shogun/distance/CustomDistance.h
@@ -38,6 +38,11 @@ class CCustomDistance: public CDistance
 		 * @param d distance matrix
 		 */
 		CCustomDistance(CDistance* d);
+
+		/** constructor 
+		 * @param distance_matrix distance matrix
+		 */
+		CCustomDistance(const SGMatrix<float64_t> distance_matrix);
 
 		/** constructor
 		 *