use free_matrix instead of destroy_matrix and adjust swig in typemaps

shogun-toolbox · Nov 14, 2011 · 0ef3680 · 0ef3680
1 parent 54fc133
commit 0ef3680
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/interfaces/csharp_modular/swig_typemaps.i b/src/interfaces/csharp_modular/swig_typemaps.i
@@ -113,7 +113,7 @@ TYPEMAP_SGVECTOR(float64_t, double, double)
 		array[i] = (SGTYPE)$input[i];
 	}
 
-	$1 = shogun::SGMatrix<SGTYPE>(array, rows, cols);
+	$1 = shogun::SGMatrix<SGTYPE>(array, rows, cols, true);
 }
 
 %typemap(out) shogun::SGMatrix<SGTYPE>

diff --git a/src/interfaces/java_modular/swig_typemaps.i b/src/interfaces/java_modular/swig_typemaps.i
@@ -356,7 +356,7 @@ TYPEMAP_SGVECTOR(float64_t, double, Double, jdouble, "toDoubleArray", "()[[D", "
 
 	cols = (int32_t)JCALL2(CallIntMethod, jenv, $input, mid);
 
-	$1 = shogun::SGMatrix<SGTYPE>((SGTYPE*)array, rows, cols);
+	$1 = shogun::SGMatrix<SGTYPE>((SGTYPE*)array, rows, cols, true);
 }
 
 %typemap(out) shogun::SGMatrix<SGTYPE>

diff --git a/src/interfaces/lua_modular/swig_typemaps.i b/src/interfaces/lua_modular/swig_typemaps.i
@@ -226,7 +226,7 @@ TYPEMAP_SGVECTOR(float64_t)
 		lua_pop(L, 1);
 	}
 
-	$1 = shogun::SGMatrix<SGTYPE>((SGTYPE*)array, rows, cols);
+	$1 = shogun::SGMatrix<SGTYPE>((SGTYPE*)array, rows, cols, true);
 }
 
 %typemap(out) shogun::SGMatrix<SGTYPE> {

diff --git a/src/interfaces/octave_modular/swig_typemaps.i b/src/interfaces/octave_modular/swig_typemaps.i
@@ -129,7 +129,7 @@ TYPEMAP_OUT_SGVECTOR(uint16NDArray, uint16_t, uint16_t, "Word")
     m = mat_feat.oct_converter();
 
     void* copy=get_copy((void*) m.fortran_vec(), size_t(m.cols())*m.rows()*sizeof(sg_type));
-    $1 = shogun::SGMatrix<sg_type>((sg_type*) copy, m.rows(), m.cols());
+    $1 = shogun::SGMatrix<sg_type>((sg_type*) copy, m.rows(), m.cols(), true);
 }
 %typemap(freearg) shogun::SGMatrix<sg_type>
 {

diff --git a/src/interfaces/python_modular/swig_typemaps.i b/src/interfaces/python_modular/swig_typemaps.i
@@ -248,7 +248,7 @@ TYPEMAP_OUT_SGVECTOR(PyObject,      NPY_OBJECT)
         SWIG_fail;
 
     $1 = shogun::SGMatrix<type>((type*) PyArray_BYTES(array),
-            PyArray_DIM(array,0), PyArray_DIM(array,1));
+            PyArray_DIM(array,0), PyArray_DIM(array,1), true);
 
     ((PyArrayObject*) array)->flags &= (-1 ^ NPY_OWNDATA);
     Py_DECREF(array);

diff --git a/src/interfaces/ruby_modular/swig_typemaps.i b/src/interfaces/ruby_modular/swig_typemaps.i
@@ -127,7 +127,7 @@ TYPEMAP_SGVECTOR(float64_t, NUM2DBL, rb_float_new)
 	else {
 		rb_raise(rb_eArgError, "Expected Arrays");
 	}
-	$1 = shogun::SGMatrix<SGTYPE>((SGTYPE*)array, rows, cols);
+	$1 = shogun::SGMatrix<SGTYPE>((SGTYPE*)array, rows, cols, true);
 }
 
 %typemap(out) shogun::SGMatrix<SGTYPE> {

diff --git a/src/shogun/kernel/CustomKernel.h b/src/shogun/kernel/CustomKernel.h
@@ -247,8 +247,8 @@ class CCustomKernel: public CKernel
 			}
 
 			dummy_init(rows, cols);
-			// temporary bugfix, TODO with free_matrix
-			full_kernel_matrix.destroy_matrix();
+
+			full_kernel_matrix.free_matrix();
 			return true;
 		}