fixed set_triangle_kernel_matrix_from_full in custom kernel

shogun-toolbox · Apr 8, 2012 · c5c7117 · c5c7117
1 parent 46353c3
commit c5c7117
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/examples/undocumented/python_modular/kernel_custom_modular.py b/examples/undocumented/python_modular/kernel_custom_modular.py
@@ -1,9 +1,9 @@
 from numpy.random import seed
 seed(42)
 
-parameter_list=[[7],[8]]
+parameter_list=[[3],[3]]
 
-def kernel_custom_modular (dim=7):
+def kernel_custom_modular (dim=1):
 	from numpy.random import rand, seed
 	from numpy import array, float32
 	from shogun.Features import RealFeatures
@@ -25,7 +25,7 @@ def kernel_custom_modular (dim=7):
 	kernel.set_triangle_kernel_matrix_from_full(symdata)
 	km_fulltriangle=kernel.get_kernel_matrix()
 
-	kernel.set_full_kernel_matrix_from_full(data)
+	kernel.set_full_kernel_matrix_from_full(symdata)
 	km_fullfull=kernel.get_kernel_matrix()
 
 	# now once with float32's
@@ -37,7 +37,7 @@ def kernel_custom_modular (dim=7):
 	kernel.set_triangle_kernel_matrix_from_full(symdata)
 	km_fulltriangle=kernel.get_kernel_matrix()
 
-	kernel.set_full_kernel_matrix_from_full(data)
+	kernel.set_full_kernel_matrix_from_full(symdata)
 	km_fullfull=kernel.get_kernel_matrix()
 	return km_fullfull,kernel
 

diff --git a/src/shogun/kernel/CustomKernel.cpp b/src/shogun/kernel/CustomKernel.cpp
@@ -185,8 +185,7 @@ void CCustomKernel::print_kernel_matrix(const char* prefix) const
 		{
 			index_t real_i=row_subset_idx_conversion(i);
 			index_t real_j=col_subset_idx_conversion(j);
-			SG_PRINT("%s%4.2f", kmatrix.matrix[kmatrix.num_rows*real_j+real_i],
-					prefix);
+			SG_PRINT("%s%4.2f", prefix, kmatrix.matrix[kmatrix.num_rows*real_j+real_i]);
 			if (j<num_cols-1)
 				SG_PRINT(", \t");
 		}

diff --git a/src/shogun/kernel/CustomKernel.h b/src/shogun/kernel/CustomKernel.h
@@ -216,10 +216,10 @@ class CCustomKernel: public CKernel
 			cleanup_custom();
 			SG_DEBUG( "using custom kernel of size %dx%d\n", cols,cols);
 
-			kmatrix.matrix = SG_MALLOC(float32_t, int64_t(rows)*cols);
+			kmatrix.matrix = SG_MALLOC(float32_t, cols*(cols+1)/2);
 			kmatrix.num_rows = rows;
-			kmatrix.num_cols = cols;
-			upper_diagonal = false;
+			kmatrix.num_cols = cols;			
+			upper_diagonal = true;
 
 			for (int64_t row=0; row<rows; row++)
 			{