"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/armadillo_bits/Mat_meat.hpp" between
armadillo-10.8.2.tar.xz and armadillo-11.0.0.tar.xz

About: Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use.

Mat_meat.hpp  (armadillo-10.8.2.tar.xz):Mat_meat.hpp  (armadillo-11.0.0.tar.xz)
skipping to change at line 5560 skipping to change at line 5560
//! element accessor; no bounds check //! element accessor; no bounds check
template<typename eT> template<typename eT>
arma_inline arma_inline
arma_warn_unused arma_warn_unused
const eT& const eT&
Mat<eT>::at(const uword in_row, const uword in_col) const Mat<eT>::at(const uword in_row, const uword in_col) const
{ {
return mem[in_row + in_col*n_rows]; return mem[in_row + in_col*n_rows];
} }
#if defined(__cpp_multidimensional_subscript)
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
eT&
Mat<eT>::operator[] (const uword in_row, const uword in_col)
{
return access::rw( mem[in_row + in_col*n_rows] );
}
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::operator[] (const uword in_row, const uword in_col) const
{
return mem[in_row + in_col*n_rows];
}
#endif
//! prefix ++ //! prefix ++
template<typename eT> template<typename eT>
arma_inline arma_inline
const Mat<eT>& const Mat<eT>&
Mat<eT>::operator++() Mat<eT>::operator++()
{ {
Mat_aux::prefix_pp(*this); Mat_aux::prefix_pp(*this);
return *this; return *this;
} }
skipping to change at line 5657 skipping to change at line 5681
return (n_rows == n_cols); return (n_rows == n_cols);
} }
//! returns true if all of the elements are finite //! returns true if all of the elements are finite
template<typename eT> template<typename eT>
inline inline
arma_warn_unused arma_warn_unused
bool bool
Mat<eT>::is_finite() const Mat<eT>::is_finite() const
{ {
return arrayops::is_finite( memptr(), n_elem ); return arrayops::is_finite(memptr(), n_elem);
} }
template<typename eT> template<typename eT>
inline inline
arma_warn_unused arma_warn_unused
bool bool
Mat<eT>::has_inf() const Mat<eT>::has_inf() const
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
skipping to change at line 5686 skipping to change at line 5710
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
return arrayops::has_nan(memptr(), n_elem); return arrayops::has_nan(memptr(), n_elem);
} }
template<typename eT> template<typename eT>
inline inline
arma_warn_unused arma_warn_unused
bool bool
Mat<eT>::has_nonfinite() const
{
arma_extra_debug_sigprint();
return (arrayops::is_finite(memptr(), n_elem) == false);
}
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::is_sorted(const char* direction) const Mat<eT>::is_sorted(const char* direction) const
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
return (*this).is_sorted(direction, (((vec_state == 2) || (n_rows == 1)) ? uwo rd(1) : uword(0))); return (*this).is_sorted(direction, (((vec_state == 2) || (n_rows == 1)) ? uwo rd(1) : uword(0)));
} }
template<typename eT> template<typename eT>
inline inline
arma_warn_unused arma_warn_unused
skipping to change at line 8645 skipping to change at line 8680
arma_inline arma_inline
arma_warn_unused arma_warn_unused
const eT& const eT&
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword ii) const Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword ii) const
{ {
arma_debug_check_bounds( (ii >= fixed_n_elem), "Mat::operator(): index out of bounds" ); arma_debug_check_bounds( (ii >= fixed_n_elem), "Mat::operator(): index out of bounds" );
return (use_extra) ? mem_local_extra[ii] : mem_local[ii]; return (use_extra) ? mem_local_extra[ii] : mem_local[ii];
} }
#if defined(__cpp_multidimensional_subscript)
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
eT&
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator[] (const uword in_row, co
nst uword in_col)
{
const uword iq = in_row + in_col*fixed_n_rows;
return (use_extra) ? mem_local_extra[iq] : mem_local[iq];
}
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator[] (const uword in_row, co
nst uword in_col) const
{
const uword iq = in_row + in_col*fixed_n_rows;
return (use_extra) ? mem_local_extra[iq] : mem_local[iq];
}
#endif
template<typename eT> template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols> template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline arma_inline
arma_warn_unused arma_warn_unused
eT& eT&
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::at(const uword in_row, const uword i n_col) Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::at(const uword in_row, const uword i n_col)
{ {
const uword iq = in_row + in_col*fixed_n_rows; const uword iq = in_row + in_col*fixed_n_rows;
return (use_extra) ? mem_local_extra[iq] : mem_local[iq]; return (use_extra) ? mem_local_extra[iq] : mem_local[iq];
skipping to change at line 9031 skipping to change at line 9094
{ {
for(uword col=0; col < local_n_cols; ++col) for(uword col=0; col < local_n_cols; ++col)
for(uword row=0; row < local_n_rows; ++row) for(uword row=0; row < local_n_rows; ++row)
{ {
(*out_mem) = std::complex<T>( (*out_mem).real(), P.at(row,col) ); (*out_mem) = std::complex<T>( (*out_mem).real(), P.at(row,col) );
out_mem++; out_mem++;
} }
} }
} }
#ifdef ARMA_EXTRA_MAT_MEAT #if defined(ARMA_EXTRA_MAT_MEAT)
#include ARMA_INCFILE_WRAP(ARMA_EXTRA_MAT_MEAT) #include ARMA_INCFILE_WRAP(ARMA_EXTRA_MAT_MEAT)
#endif #endif
//! @} //! @}
 End of changes. 5 change blocks. 
2 lines changed or deleted 67 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)