Col_bones.hpp   Col_bones.hpp 
skipping to change at line 171 skipping to change at line 171
inline const Col& operator=(const std::string& text); inline const Col& operator=(const std::string& text);
inline const Col& operator=(const subview_cube<eT>& X); inline const Col& operator=(const subview_cube<eT>& X);
using Col<eT>::operator(); using Col<eT>::operator();
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11)
inline fixed(const std::initializer_list<eT>& list); inline fixed(const std::initializer_list<eT>& list);
inline const Col& operator=(const std::initializer_list<eT>& list); inline const Col& operator=(const std::initializer_list<eT>& list);
#endif #endif
arma_inline const Op< typename Col<eT>::template fixed<fixed_n_elem>, op_ arma_inline const Op< Col_fixed_type, op_htrans > t() const;
htrans > t() const; arma_inline const Op< Col_fixed_type, op_htrans > ht() const;
arma_inline const Op< typename Col<eT>::template fixed<fixed_n_elem>, op_ arma_inline const Op< Col_fixed_type, op_strans > st() const;
htrans > ht() const;
arma_inline const Op< typename Col<eT>::template fixed<fixed_n_elem>, op_
strans > st() const;
arma_inline arma_warn_unused eT& operator[] (const uword i); arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused eT operator[] (const uword i) const; arma_inline arma_warn_unused eT operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i); arma_inline arma_warn_unused eT& at (const uword i);
arma_inline arma_warn_unused eT at (const uword i) const; arma_inline arma_warn_unused eT at (const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i); arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused eT operator() (const uword i) const; arma_inline arma_warn_unused eT operator() (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword in_row, const uw ord in_col); arma_inline arma_warn_unused eT& at (const uword in_row, const uw ord in_col);
arma_inline arma_warn_unused eT at (const uword in_row, const uw ord in_col) const; arma_inline arma_warn_unused eT at (const uword in_row, const uw ord in_col) const;
 End of changes. 1 change blocks. 
6 lines changed or deleted 3 lines changed or added


 Col_meat.hpp   Col_meat.hpp 
skipping to change at line 897 skipping to change at line 897
for(uword iq=N; iq < fixed_n_elem; ++iq) { this_mem[iq] = eT(0); } for(uword iq=N; iq < fixed_n_elem; ++iq) { this_mem[iq] = eT(0); }
return *this; return *this;
} }
#endif #endif
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
const Op< typename Col<eT>::template fixed<fixed_n_elem>, op_htrans > const Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type, o p_htrans >
Col<eT>::fixed<fixed_n_elem>::t() const Col<eT>::fixed<fixed_n_elem>::t() const
{ {
return Op< typename Col<eT>::template fixed<fixed_n_elem>, op_htrans >(*t his); return Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type , op_htrans >(*this);
} }
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
const Op< typename Col<eT>::template fixed<fixed_n_elem>, op_htrans > const Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type, o p_htrans >
Col<eT>::fixed<fixed_n_elem>::ht() const Col<eT>::fixed<fixed_n_elem>::ht() const
{ {
return Op< typename Col<eT>::template fixed<fixed_n_elem>, op_htrans >(*t his); return Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type , op_htrans >(*this);
} }
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
const Op< typename Col<eT>::template fixed<fixed_n_elem>, op_strans > const Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type, o p_strans >
Col<eT>::fixed<fixed_n_elem>::st() const Col<eT>::fixed<fixed_n_elem>::st() const
{ {
return Op< typename Col<eT>::template fixed<fixed_n_elem>, op_strans >(*t his); return Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type , op_strans >(*this);
} }
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
arma_warn_unused arma_warn_unused
eT& eT&
Col<eT>::fixed<fixed_n_elem>::operator[] (const uword ii) Col<eT>::fixed<fixed_n_elem>::operator[] (const uword ii)
{ {
return (use_extra) ? mem_local_extra[ii] : Mat<eT>::mem_local[ii]; return (use_extra) ? mem_local_extra[ii] : Mat<eT>::mem_local[ii];
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 Mat_bones.hpp   Mat_bones.hpp 
skipping to change at line 550 skipping to change at line 550
inline fixed(const std::string& text); inline fixed(const std::string& text);
using Mat<eT>::operator=; using Mat<eT>::operator=;
using Mat<eT>::operator(); using Mat<eT>::operator();
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11)
inline fixed(const std::initializer_list<eT>& list); inline fixed(const std::initializer_list<eT>& list);
inline const Mat& operator=(const std::initializer_list<eT>& list); inline const Mat& operator=(const std::initializer_list<eT>& list);
#endif #endif
arma_inline const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixe arma_inline const Op< Mat_fixed_type, op_htrans > t() const;
d_n_cols>, op_htrans > t() const; arma_inline const Op< Mat_fixed_type, op_htrans > ht() const;
arma_inline const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixe arma_inline const Op< Mat_fixed_type, op_strans > st() const;
d_n_cols>, op_htrans > ht() const;
arma_inline const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixe
d_n_cols>, op_strans > st() const;
arma_inline arma_warn_unused eT& operator[] (const uword i); arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused eT operator[] (const uword i) const; arma_inline arma_warn_unused eT operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i); arma_inline arma_warn_unused eT& at (const uword i);
arma_inline arma_warn_unused eT at (const uword i) const; arma_inline arma_warn_unused eT at (const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i); arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused eT operator() (const uword i) const; arma_inline arma_warn_unused eT operator() (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword in_row, const uw ord in_col); arma_inline arma_warn_unused eT& at (const uword in_row, const uw ord in_col);
arma_inline arma_warn_unused eT at (const uword in_row, const uw ord in_col) const; arma_inline arma_warn_unused eT at (const uword in_row, const uw ord in_col) const;
 End of changes. 1 change blocks. 
6 lines changed or deleted 3 lines changed or added


 Mat_meat.hpp   Mat_meat.hpp 
skipping to change at line 5639 skipping to change at line 5639
for(uword iq=N; iq < fixed_n_elem; ++iq) { this_mem[iq] = eT(0); } for(uword iq=N; iq < fixed_n_elem; ++iq) { this_mem[iq] = eT(0); }
return *this; return *this;
} }
#endif #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
const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>, op_ htrans > const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>::Mat _fixed_type, op_htrans >
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::t() const Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::t() const
{ {
return Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>, op_htrans >(*this); return Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>:: Mat_fixed_type, op_htrans >(*this);
} }
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
const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>, op_ htrans > const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>::Mat _fixed_type, op_htrans >
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::ht() const Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::ht() const
{ {
return Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>, op_htrans >(*this); return Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>:: Mat_fixed_type, op_htrans >(*this);
} }
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
const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>, op_ strans > const Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>::Mat _fixed_type, op_strans >
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::st() const Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::st() const
{ {
return Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>, op_strans >(*this); return Op< typename Mat<eT>::template fixed<fixed_n_rows, fixed_n_cols>:: Mat_fixed_type, op_strans >(*this);
} }
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>::operator[] (const uword ii) Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator[] (const uword ii)
{ {
return (use_extra) ? mem_local_extra[ii] : mem_local[ii]; return (use_extra) ? mem_local_extra[ii] : mem_local[ii];
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 Row_bones.hpp   Row_bones.hpp 
skipping to change at line 169 skipping to change at line 169
inline const Row& operator=(const std::string& text); inline const Row& operator=(const std::string& text);
inline const Row& operator=(const subview_cube<eT>& X); inline const Row& operator=(const subview_cube<eT>& X);
using Row<eT>::operator(); using Row<eT>::operator();
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11)
inline fixed(const std::initializer_list<eT>& list); inline fixed(const std::initializer_list<eT>& list);
inline const Row& operator=(const std::initializer_list<eT>& list); inline const Row& operator=(const std::initializer_list<eT>& list);
#endif #endif
arma_inline const Op< typename Row<eT>::template fixed<fixed_n_elem>, op_ arma_inline const Op< Row_fixed_type, op_htrans > t() const;
htrans > t() const; arma_inline const Op< Row_fixed_type, op_htrans > ht() const;
arma_inline const Op< typename Row<eT>::template fixed<fixed_n_elem>, op_ arma_inline const Op< Row_fixed_type, op_strans > st() const;
htrans > ht() const;
arma_inline const Op< typename Row<eT>::template fixed<fixed_n_elem>, op_
strans > st() const;
arma_inline arma_warn_unused eT& operator[] (const uword i); arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused eT operator[] (const uword i) const; arma_inline arma_warn_unused eT operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i); arma_inline arma_warn_unused eT& at (const uword i);
arma_inline arma_warn_unused eT at (const uword i) const; arma_inline arma_warn_unused eT at (const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i); arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused eT operator() (const uword i) const; arma_inline arma_warn_unused eT operator() (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword in_row, const uw ord in_col); arma_inline arma_warn_unused eT& at (const uword in_row, const uw ord in_col);
arma_inline arma_warn_unused eT at (const uword in_row, const uw ord in_col) const; arma_inline arma_warn_unused eT at (const uword in_row, const uw ord in_col) const;
 End of changes. 1 change blocks. 
6 lines changed or deleted 3 lines changed or added


 Row_meat.hpp   Row_meat.hpp 
skipping to change at line 837 skipping to change at line 837
for(uword iq=N; iq < fixed_n_elem; ++iq) { this_mem[iq] = eT(0); } for(uword iq=N; iq < fixed_n_elem; ++iq) { this_mem[iq] = eT(0); }
return *this; return *this;
} }
#endif #endif
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
const Op< typename Row<eT>::template fixed<fixed_n_elem>, op_htrans > const Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type, o p_htrans >
Row<eT>::fixed<fixed_n_elem>::t() const Row<eT>::fixed<fixed_n_elem>::t() const
{ {
return Op< typename Row<eT>::template fixed<fixed_n_elem>, op_htrans >(*t his); return Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type , op_htrans >(*this);
} }
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
const Op< typename Row<eT>::template fixed<fixed_n_elem>, op_htrans > const Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type, o p_htrans >
Row<eT>::fixed<fixed_n_elem>::ht() const Row<eT>::fixed<fixed_n_elem>::ht() const
{ {
return Op< typename Row<eT>::template fixed<fixed_n_elem>, op_htrans >(*t his); return Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type , op_htrans >(*this);
} }
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
const Op< typename Row<eT>::template fixed<fixed_n_elem>, op_strans > const Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type, o p_strans >
Row<eT>::fixed<fixed_n_elem>::st() const Row<eT>::fixed<fixed_n_elem>::st() const
{ {
return Op< typename Row<eT>::template fixed<fixed_n_elem>, op_strans >(*t his); return Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type , op_strans >(*this);
} }
template<typename eT> template<typename eT>
template<uword fixed_n_elem> template<uword fixed_n_elem>
arma_inline arma_inline
arma_warn_unused arma_warn_unused
eT& eT&
Row<eT>::fixed<fixed_n_elem>::operator[] (const uword ii) Row<eT>::fixed<fixed_n_elem>::operator[] (const uword ii)
{ {
return (use_extra) ? mem_local_extra[ii] : Mat<eT>::mem_local[ii]; return (use_extra) ? mem_local_extra[ii] : Mat<eT>::mem_local[ii];
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 arma_version.hpp   arma_version.hpp 
skipping to change at line 12 skipping to change at line 12
// Copyright (C) 2009-2013 Conrad Sanderson // Copyright (C) 2009-2013 Conrad Sanderson
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
//! \addtogroup arma_version //! \addtogroup arma_version
//! @{ //! @{
#define ARMA_VERSION_MAJOR 3 #define ARMA_VERSION_MAJOR 3
#define ARMA_VERSION_MINOR 819 #define ARMA_VERSION_MINOR 820
#define ARMA_VERSION_PATCH 1 #define ARMA_VERSION_PATCH 0
#define ARMA_VERSION_NAME "unstable development version -- not for product #define ARMA_VERSION_NAME "Mt Cootha"
ion use"
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. 
4 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/