| arma_version.hpp | arma_version.hpp | |||
|---|---|---|---|---|
| skipping to change at line 18 | skipping to change at line 18 | |||
| // Lesser General Public License (LGPL) as published | // Lesser General Public License (LGPL) as published | |||
| // by the Free Software Foundation, either version 3 | // by the Free Software Foundation, either version 3 | |||
| // of the License or (at your option) any later version. | // of the License or (at your option) any later version. | |||
| // (see http://www.opensource.org/licenses for more info) | // (see http://www.opensource.org/licenses for more info) | |||
| //! \addtogroup arma_version | //! \addtogroup arma_version | |||
| //! @{ | //! @{ | |||
| #define ARMA_VERSION_MAJOR 3 | #define ARMA_VERSION_MAJOR 3 | |||
| #define ARMA_VERSION_MINOR 1 | #define ARMA_VERSION_MINOR 1 | |||
| #define ARMA_VERSION_PATCH 93 | #define ARMA_VERSION_PATCH 94 | |||
| #define ARMA_VERSION_NAME "v3.2 beta 3" | #define ARMA_VERSION_NAME "v3.2 beta 4" | |||
| struct arma_version | struct arma_version | |||
| { | { | |||
| static const unsigned int major = ARMA_VERSION_MAJOR; | static const unsigned int major = ARMA_VERSION_MAJOR; | |||
| static const unsigned int minor = ARMA_VERSION_MINOR; | static const unsigned int minor = ARMA_VERSION_MINOR; | |||
| static const unsigned int patch = ARMA_VERSION_PATCH; | static const unsigned int patch = ARMA_VERSION_PATCH; | |||
| static | static | |||
| inline | inline | |||
| std::string | std::string | |||
| End of changes. 1 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||
| fn_rank.hpp | fn_rank.hpp | |||
|---|---|---|---|---|
| skipping to change at line 35 | skipping to change at line 35 | |||
| typename T1::pod_type tol = 0.0, | typename T1::pod_type tol = 0.0, | |||
| const typename arma_blas_type_only<typename T1::elem_type>::result* junk = 0 | const typename arma_blas_type_only<typename T1::elem_type>::result* junk = 0 | |||
| ) | ) | |||
| { | { | |||
| arma_extra_debug_sigprint(); | arma_extra_debug_sigprint(); | |||
| arma_ignore(junk); | arma_ignore(junk); | |||
| typedef typename T1::elem_type eT; | typedef typename T1::elem_type eT; | |||
| typedef typename T1::pod_type T; | typedef typename T1::pod_type T; | |||
| uword X_n_rows; | uword X_n_rows; | |||
| uword X_n_cols; | uword X_n_cols; | |||
| Col<T> s; | Col<T> s; | |||
| const bool status = auxlib::svd(s, X, X_n_rows, X_n_cols); | const bool status = auxlib::svd(s, X, X_n_rows, X_n_cols); | |||
| const uword n_elem = s.n_elem; | const uword n_elem = s.n_elem; | |||
| if(status == true) | if(status == true) | |||
| { | { | |||
| if( (tol == T(0)) && (n_elem > 0) ) | if( (tol == T(0)) && (n_elem > 0) ) | |||
| { | { | |||
| tol = (std::max)(X_n_rows, X_n_cols) * eop_aux::direct_eps(max(s)); | tol = (std::max)(X_n_rows, X_n_cols) * eop_aux::direct_eps(max(s)); | |||
| } | } | |||
| // count non zero valued elements in s | // count non zero valued elements in s | |||
| End of changes. 2 change blocks. | ||||
| 4 lines changed or deleted | 4 lines changed or added | |||
| fn_trace.hpp | fn_trace.hpp | |||
|---|---|---|---|---|
| skipping to change at line 32 | skipping to change at line 32 | |||
| { | { | |||
| arma_extra_debug_sigprint(); | arma_extra_debug_sigprint(); | |||
| typedef typename T1::elem_type eT; | typedef typename T1::elem_type eT; | |||
| const Proxy<T1> A(X.get_ref()); | const Proxy<T1> A(X.get_ref()); | |||
| arma_debug_check( (A.get_n_rows() != A.get_n_cols()), "trace(): matrix mu st be square sized" ); | arma_debug_check( (A.get_n_rows() != A.get_n_cols()), "trace(): matrix mu st be square sized" ); | |||
| const uword N = A.get_n_rows(); | const uword N = A.get_n_rows(); | |||
| eT val = eT(0); | eT val = eT(0); | |||
| for(uword i=0; i<N; ++i) | for(uword i=0; i<N; ++i) | |||
| { | { | |||
| val += A.at(i,i); | val += A.at(i,i); | |||
| } | } | |||
| return val; | return val; | |||
| } | } | |||
| template<typename T1> | template<typename T1> | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||