Merge branch '24-updated-api-in-bob-math-requires-changes-here-too' into 'master'

Adapted linsolve API of new bob.math version

Closes #24

See merge request !25

bob/learn/em/cpp/IVectorMachine.cpp

@@ -206,7 +206,7 @@ void bob::learn::em::IVectorMachine::resizeTmp()
 void bob::learn::em::IVectorMachine::forward(const bob::learn::em::GMMStats& gs,
   blitz::Array<double,1>& ivector) const
 {
-  bob::core::array::assertSameDimensionLength(ivector.extent(0), (int)m_rt);  
+  bob::core::array::assertSameDimensionLength(ivector.extent(0), (int)m_rt);
   forward_(gs, ivector);
 }
 
@@ -246,6 +246,5 @@ void bob::learn::em::IVectorMachine::forward_(const bob::learn::em::GMMStats& gs
   computeTtSigmaInvFnorm(gs, m_tmp_t1);
 
   // Solves m_tmp_tt.ivector = m_tmp_t1
-  bob::math::linsolve(m_tmp_tt, ivector, m_tmp_t1);
+  bob::math::linsolve(m_tmp_tt, m_tmp_t1, ivector);
 }
-

bob/learn/em/cpp/IVectorTrainer.cpp

@@ -170,7 +170,7 @@ void bob::learn::em::IVectorTrainer::mStep(
     if (blitz::all(acc_Nij_wij2_c == 0)) // TODO
       Tt_c = 0;
     else
-      bob::math::linsolve(tacc_Nij_wij2_c, Tt_c, tacc_Fnormij_wij_c);
+      bob::math::linsolve(tacc_Nij_wij2_c, tacc_Fnormij_wij_c, Tt_c);
     if (m_update_sigma)
     {
       blitz::Array<double,1> sigma_c = sigma(blitz::Range(c*D,(c+1)*D-1));

requirements.txt

@@ -4,6 +4,6 @@ bob.blitz
 bob.core>2.0.5
 bob.io.base
 bob.sp
-bob.math
+bob.math>2.1.1
 bob.learn.activation
 bob.learn.linear