diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-10-23 23:39:20 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-10-23 23:39:20 +0400 |
| commit | 8a6a3dbb547bc87759fda875ad2fdd85bb32835c (patch) | |
| tree | 8f9be67a532db092c26bb9f3eb91ea9309b94b8f /intern/itasc/WSDLSSolver.cpp | |
| parent | 82c84f4b58e0d836361a2cadc9ce2941a3d4ff39 (diff) | |
Fix for commit 41227 (Some opening comment tags (/*) were lost!).
Diffstat (limited to 'intern/itasc/WSDLSSolver.cpp')
| -rw-r--r-- | intern/itasc/WSDLSSolver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/itasc/WSDLSSolver.cpp b/intern/itasc/WSDLSSolver.cpp index 6fdd8e6e06c..014c312635f 100644 --- a/intern/itasc/WSDLSSolver.cpp +++ b/intern/itasc/WSDLSSolver.cpp @@ -60,7 +60,7 @@ bool WSDLSSolver::solve(const e_matrix& A, const e_vector& Wy, const e_vector& y e_scalar N, M; // Create the Weighted jacobian - m_AWq.noalias() = A*Wq; + m_AWq = (A*Wq).lazy(); for (i=0; i<m_nc; i++) m_WyAWq.row(i) = Wy(i)*m_AWq.row(i); @@ -75,8 +75,8 @@ bool WSDLSSolver::solve(const e_matrix& A, const e_vector& Wy, const e_vector& y if(ret<0) return false; - m_Wy_ydot = Wy.array() * ydot.array(); - m_WqV.noalias() = Wq*m_V; + m_Wy_ydot = Wy.cwise() * ydot; + m_WqV = (Wq*m_V).lazy(); qdot.setZero(); e_scalar maxDeltaS = e_scalar(0.0); e_scalar prevS = e_scalar(0.0); @@ -121,7 +121,7 @@ bool WSDLSSolver::solve(const e_matrix& A, const e_vector& Wy, const e_vector& y M *= Sinv; alpha = m_U.col(i).dot(m_Wy_ydot); _qmax = (N < M) ? m_qmax*N/M : m_qmax; - vmax = m_WqV.col(i).array().abs().maxCoeff(); + vmax = m_WqV.col(i).cwise().abs().maxCoeff(); norm = fabs(Sinv*alpha*vmax); if (norm > _qmax) { damp = Sinv*alpha*_qmax/norm; |