diff --git a/bob/math/gsvd.cpp b/bob/math/gsvd.cpp index 8d80eafce2bb89ab4ebec2f45aef45312011a990..6868021c43f9a82a20ea7a3489a8d057ac95fd52 100644 --- a/bob/math/gsvd.cpp +++ b/bob/math/gsvd.cpp @@ -70,7 +70,7 @@ PyObject* py_gsvd (PyObject*, PyObject* args, PyObject* kwds) { PyErr_SetString(PyExc_RuntimeError, e.what()); } catch (...) { - PyErr_SetString(PyExc_RuntimeError, "norminv failed: unknown exception caught"); + PyErr_SetString(PyExc_RuntimeError, "gsvd failed: unknown exception caught"); } @@ -117,7 +117,7 @@ PyObject* py_svd (PyObject*, PyObject* args, PyObject* kwds) { try { - bob::math::svd(*A_bz,V,S,U); + bob::math::svd(*A_bz,V,S,U, true); // S for the python output. // LAPACK returns an 1d matrix of size n. @@ -137,7 +137,7 @@ PyObject* py_svd (PyObject*, PyObject* args, PyObject* kwds) { PyErr_SetString(PyExc_RuntimeError, e.what()); } catch (...) { - PyErr_SetString(PyExc_RuntimeError, "norminv failed: unknown exception caught"); + PyErr_SetString(PyExc_RuntimeError, "svd failed: unknown exception caught"); } diff --git a/bob/math/test_gsvd.py b/bob/math/test_gsvd.py index eac76a011776c66bbc7c3f743bb73550aca251eb..e0a6a31eedee761f96de951adffcc896a453171d 100644 --- a/bob/math/test_gsvd.py +++ b/bob/math/test_gsvd.py @@ -20,7 +20,6 @@ import bob.math import numpy import nose.tools numpy.random.seed(10) -import pkg_resources def gsvd_relations(A,B): @@ -104,7 +103,7 @@ def test_svd_signal(): A = numpy.array([[3,-3,100], [4,-4,50], [3.5,-3.5,-50], [3.8,-3.7,-100]], dtype='float64') U_ref = numpy.array([[ 2.20825004e-03, -1.80819459e-03, -9.99995927e-01], - [ 7.09549949e-01, -7.04649416e-01, 2.84101853e-03], + [ -7.09549949e-01, 7.04649416e-01, -2.84101853e-03], [ -7.04651683e-01, -7.09553332e-01, -2.73037723e-04]]) [U,S,V] = bob.math.svd(A)