"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/armadillo_bits/field_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.

field_meat.hpp  (armadillo-10.8.2.tar.xz):field_meat.hpp  (armadillo-11.0.0.tar.xz)
skipping to change at line 532 skipping to change at line 532
arma_inline arma_inline
arma_warn_unused arma_warn_unused
const oT& const oT&
field<oT>::operator() (const uword in_row, const uword in_col, const uword in_sl ice) const field<oT>::operator() (const uword in_row, const uword in_col, const uword in_sl ice) const
{ {
arma_debug_check_bounds( ((in_row >= n_rows) || (in_col >= n_cols) || (in_slic e >= n_slices)), "field::operator(): index out of bounds" ); arma_debug_check_bounds( ((in_row >= n_rows) || (in_col >= n_cols) || (in_slic e >= n_slices)), "field::operator(): index out of bounds" );
return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]); return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]);
} }
#if defined(__cpp_multidimensional_subscript)
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::operator[] (const uword in_row, const uword in_col)
{
return (*mem[in_row + in_col*n_rows]);
}
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::operator[] (const uword in_row, const uword in_col) const
{
return (*mem[in_row + in_col*n_rows]);
}
#endif
//! element accessor; no bounds check //! element accessor; no bounds check
template<typename oT> template<typename oT>
arma_inline arma_inline
arma_warn_unused arma_warn_unused
oT& oT&
field<oT>::at(const uword in_row, const uword in_col) field<oT>::at(const uword in_row, const uword in_col)
{ {
return (*mem[in_row + in_col*n_rows]); return (*mem[in_row + in_col*n_rows]);
} }
//! element accessor; no bounds check //! element accessor; no bounds check
template<typename oT> template<typename oT>
arma_inline arma_inline
arma_warn_unused arma_warn_unused
const oT& const oT&
field<oT>::at(const uword in_row, const uword in_col) const field<oT>::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 oT>
arma_inline
arma_warn_unused
oT&
field<oT>::operator[] (const uword in_row, const uword in_col, const uword in_
slice)
{
return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]);
}
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::operator[] (const uword in_row, const uword in_col, const uword in_
slice) const
{
return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]);
}
#endif
//! element accessor; no bounds check //! element accessor; no bounds check
template<typename oT> template<typename oT>
arma_inline arma_inline
arma_warn_unused arma_warn_unused
oT& oT&
field<oT>::at(const uword in_row, const uword in_col, const uword in_slice) field<oT>::at(const uword in_row, const uword in_col, const uword in_slice)
{ {
return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]); return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]);
} }
skipping to change at line 2629 skipping to change at line 2677
bool bool
field_aux::load(field< std::string >& x, std::istream& is, const file_type type, std::string& err_msg) field_aux::load(field< std::string >& x, std::istream& is, const file_type type, std::string& err_msg)
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
arma_ignore(type); arma_ignore(type);
return diskio::load_std_string(x, is, err_msg); return diskio::load_std_string(x, is, err_msg);
} }
#ifdef ARMA_EXTRA_FIELD_MEAT #if defined(ARMA_EXTRA_FIELD_MEAT)
#include ARMA_INCFILE_WRAP(ARMA_EXTRA_FIELD_MEAT) #include ARMA_INCFILE_WRAP(ARMA_EXTRA_FIELD_MEAT)
#endif #endif
//! @} //! @}
 End of changes. 3 change blocks. 
1 lines changed or deleted 51 lines changed or added

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