From d23601d106290df25f6c3c2308d0b861c41599d6 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Sat, 7 Feb 2015 10:03:28 +0100
Subject: [PATCH] All tests passing
---
bob/learn/misc/isv_trainer.cpp | 4 ++--
bob/learn/misc/test_jfa_trainer.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bob/learn/misc/isv_trainer.cpp b/bob/learn/misc/isv_trainer.cpp
index 0e91e8b..6ac3b83 100644
--- a/bob/learn/misc/isv_trainer.cpp
+++ b/bob/learn/misc/isv_trainer.cpp
@@ -442,7 +442,7 @@ static auto m_step = bob::extension::FunctionDoc(
"",
true
)
-.add_prototype("isv_base,stats")
+.add_prototype("isv_base")
.add_parameter("isv_base", ":py:class:`bob.learn.misc.ISVBase`", "ISVBase Object");
static PyObject* PyBobLearnMiscISVTrainer_m_step(PyBobLearnMiscISVTrainerObject* self, PyObject* args, PyObject* kwargs) {
BOB_TRY
@@ -452,7 +452,7 @@ static PyObject* PyBobLearnMiscISVTrainer_m_step(PyBobLearnMiscISVTrainerObject*
PyBobLearnMiscISVBaseObject* isv_base = 0;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!", kwlist, &PyBobLearnMiscISVBase_Type, &isv_base)) Py_RETURN_NONE;
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!", kwlist, &PyBobLearnMiscISVBase_Type, &isv_base)) return 0;
self->cxx->mStep(*isv_base->cxx);
diff --git a/bob/learn/misc/test_jfa_trainer.py b/bob/learn/misc/test_jfa_trainer.py
index c2505b2..4df6d00 100644
--- a/bob/learn/misc/test_jfa_trainer.py
+++ b/bob/learn/misc/test_jfa_trainer.py
@@ -231,7 +231,7 @@ def test_ISVTrainAndEnrol():
mb.u = M_u
for i in range(10):
t.e_step(mb, TRAINING_STATS)
- t.m_step(mb, TRAINING_STATS)
+ t.m_step(mb)
assert numpy.allclose(mb.d, d_ref, eps)
assert numpy.allclose(mb.u, u_ref, eps)
--
GitLab