phynexis-deps/armadillo-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup attributes

Browse Source
This commit is contained in:
conrad
2023-02-13 00:10:03 +10:00
parent 37b5124ba9
commit 3e7ca66f11
68 changed files with 639 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/BaseCube_bones.hpp
+11 -11
View File
@@ -24,14 +24,14 @@
template<typename elem_type, typename derived>
struct BaseCube_eval_Cube
{
arma_inline arma_warn_unused const derived& eval() const;
arma_warn_unused arma_inline const derived& eval() const;
};
template<typename elem_type, typename derived>
struct BaseCube_eval_expr
{
inline arma_warn_unused Cube<elem_type> eval() const; //!< force the immediate evaluation of a delayed expression
arma_warn_unused inline Cube<elem_type> eval() const; //!< force the immediate evaluation of a delayed expression
};
@@ -62,18 +62,18 @@ struct BaseCube
arma_cold inline void brief_print( const std::string extra_text = "") const;
arma_cold inline void brief_print(std::ostream& user_stream, const std::string extra_text = "") const;
inline arma_warn_unused elem_type min() const;
inline arma_warn_unused elem_type max() const;
arma_warn_unused inline elem_type min() const;
arma_warn_unused inline elem_type max() const;
inline arma_warn_unused uword index_min() const;
inline arma_warn_unused uword index_max() const;
arma_warn_unused inline uword index_min() const;
arma_warn_unused inline uword index_max() const;
inline arma_warn_unused bool is_zero(const typename get_pod_type<elem_type>::result tol = 0) const;
arma_warn_unused inline bool is_zero(const typename get_pod_type<elem_type>::result tol = 0) const;
inline arma_warn_unused bool is_empty() const;
inline arma_warn_unused bool is_finite() const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
arma_warn_unused inline bool is_empty() const;
arma_warn_unused inline bool is_finite() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
};
include/armadillo_bits/BaseCube_meat.hpp
-17
View File
@@ -32,7 +32,6 @@ BaseCube<elem_type,derived>::get_ref() const
template<typename elem_type, typename derived>
arma_cold
inline
void
BaseCube<elem_type,derived>::print(const std::string extra_text) const
@@ -56,7 +55,6 @@ BaseCube<elem_type,derived>::print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
BaseCube<elem_type,derived>::print(std::ostream& user_stream, const std::string extra_text) const
@@ -80,7 +78,6 @@ BaseCube<elem_type,derived>::print(std::ostream& user_stream, const std::string
template<typename elem_type, typename derived>
arma_cold
inline
void
BaseCube<elem_type,derived>::raw_print(const std::string extra_text) const
@@ -104,7 +101,6 @@ BaseCube<elem_type,derived>::raw_print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
BaseCube<elem_type,derived>::raw_print(std::ostream& user_stream, const std::string extra_text) const
@@ -128,7 +124,6 @@ BaseCube<elem_type,derived>::raw_print(std::ostream& user_stream, const std::str
template<typename elem_type, typename derived>
arma_cold
inline
void
BaseCube<elem_type,derived>::brief_print(const std::string extra_text) const
@@ -152,7 +147,6 @@ BaseCube<elem_type,derived>::brief_print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
BaseCube<elem_type,derived>::brief_print(std::ostream& user_stream, const std::string extra_text) const
@@ -177,7 +171,6 @@ BaseCube<elem_type,derived>::brief_print(std::ostream& user_stream, const std::s
template<typename elem_type, typename derived>
inline
arma_warn_unused
elem_type
BaseCube<elem_type,derived>::min() const
{
@@ -188,7 +181,6 @@ BaseCube<elem_type,derived>::min() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
elem_type
BaseCube<elem_type,derived>::max() const
{
@@ -199,7 +191,6 @@ BaseCube<elem_type,derived>::max() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
uword
BaseCube<elem_type,derived>::index_min() const
{
@@ -223,7 +214,6 @@ BaseCube<elem_type,derived>::index_min() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
uword
BaseCube<elem_type,derived>::index_max() const
{
@@ -247,7 +237,6 @@ BaseCube<elem_type,derived>::index_max() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
BaseCube<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::result tol) const
{
@@ -300,7 +289,6 @@ BaseCube<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::res
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
BaseCube<elem_type,derived>::is_empty() const
{
@@ -315,7 +303,6 @@ BaseCube<elem_type,derived>::is_empty() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
BaseCube<elem_type,derived>::is_finite() const
{
@@ -348,7 +335,6 @@ BaseCube<elem_type,derived>::is_finite() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
BaseCube<elem_type,derived>::has_inf() const
{
@@ -381,7 +367,6 @@ BaseCube<elem_type,derived>::has_inf() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
BaseCube<elem_type,derived>::has_nan() const
{
@@ -417,7 +402,6 @@ BaseCube<elem_type,derived>::has_nan() const
template<typename elem_type, typename derived>
arma_inline
arma_warn_unused
const derived&
BaseCube_eval_Cube<elem_type, derived>::eval() const
{
@@ -433,7 +417,6 @@ BaseCube_eval_Cube<elem_type, derived>::eval() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
Cube<elem_type>
BaseCube_eval_expr<elem_type, derived>::eval() const
{
include/armadillo_bits/Base_bones.hpp
+33 -33
View File
@@ -24,10 +24,10 @@
template<typename elem_type, typename derived>
struct Base_extra_yes
{
inline arma_warn_unused const Op<derived,op_inv_gen_default> i() const; //!< matrix inverse
arma_warn_unused inline const Op<derived,op_inv_gen_default> i() const; //!< matrix inverse
inline arma_warn_unused bool is_sympd() const;
inline arma_warn_unused bool is_sympd(typename get_pod_type<elem_type>::result tol) const;
arma_warn_unused inline bool is_sympd() const;
arma_warn_unused inline bool is_sympd(typename get_pod_type<elem_type>::result tol) const;
};
@@ -51,14 +51,14 @@ struct Base_extra<elem_type, derived, false> { typedef Base_extra_no<elem_type,
template<typename elem_type, typename derived>
struct Base_eval_Mat
{
arma_inline arma_warn_unused const derived& eval() const;
arma_warn_unused arma_inline const derived& eval() const;
};
template<typename elem_type, typename derived>
struct Base_eval_expr
{
inline arma_warn_unused Mat<elem_type> eval() const; //!< force the immediate evaluation of a delayed expression
arma_warn_unused inline Mat<elem_type> eval() const; //!< force the immediate evaluation of a delayed expression
};
@@ -76,18 +76,18 @@ struct Base_eval<elem_type, derived, false> { typedef Base_eval_expr<elem_type,
template<typename derived>
struct Base_trans_cx
{
arma_inline arma_warn_unused const Op<derived,op_htrans> t() const;
arma_inline arma_warn_unused const Op<derived,op_htrans> ht() const;
arma_inline arma_warn_unused const Op<derived,op_strans> st() const; // simple transpose: no complex conjugates
arma_warn_unused arma_inline const Op<derived,op_htrans> t() const;
arma_warn_unused arma_inline const Op<derived,op_htrans> ht() const;
arma_warn_unused arma_inline const Op<derived,op_strans> st() const; // simple transpose: no complex conjugates
};
template<typename derived>
struct Base_trans_default
{
arma_inline arma_warn_unused const Op<derived,op_htrans> t() const;
arma_inline arma_warn_unused const Op<derived,op_htrans> ht() const;
arma_inline arma_warn_unused const Op<derived,op_htrans> st() const; // return op_htrans instead of op_strans, as it's handled better by matrix multiplication code
arma_warn_unused arma_inline const Op<derived,op_htrans> t() const;
arma_warn_unused arma_inline const Op<derived,op_htrans> ht() const;
arma_warn_unused arma_inline const Op<derived,op_htrans> st() const; // return op_htrans instead of op_strans, as it's handled better by matrix multiplication code
};
@@ -124,8 +124,8 @@ struct Base
arma_cold inline void brief_print( const std::string extra_text = "") const;
arma_cold inline void brief_print(std::ostream& user_stream, const std::string extra_text = "") const;
inline arma_warn_unused elem_type min() const;
inline arma_warn_unused elem_type max() const;
arma_warn_unused inline elem_type min() const;
arma_warn_unused inline elem_type max() const;
inline elem_type min(uword& index_of_min_val) const;
inline elem_type max(uword& index_of_max_val) const;
@@ -133,31 +133,31 @@ struct Base
inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
inline arma_warn_unused uword index_min() const;
inline arma_warn_unused uword index_max() const;
arma_warn_unused inline uword index_min() const;
arma_warn_unused inline uword index_max() const;
inline arma_warn_unused bool is_symmetric() const;
inline arma_warn_unused bool is_symmetric(const typename get_pod_type<elem_type>::result tol) const;
arma_warn_unused inline bool is_symmetric() const;
arma_warn_unused inline bool is_symmetric(const typename get_pod_type<elem_type>::result tol) const;
inline arma_warn_unused bool is_hermitian() const;
inline arma_warn_unused bool is_hermitian(const typename get_pod_type<elem_type>::result tol) const;
arma_warn_unused inline bool is_hermitian() const;
arma_warn_unused inline bool is_hermitian(const typename get_pod_type<elem_type>::result tol) const;
inline arma_warn_unused bool is_zero(const typename get_pod_type<elem_type>::result tol = 0) const;
arma_warn_unused inline bool is_zero(const typename get_pod_type<elem_type>::result tol = 0) const;
inline arma_warn_unused bool is_trimatu() const;
inline arma_warn_unused bool is_trimatl() const;
inline arma_warn_unused bool is_diagmat() const;
inline arma_warn_unused bool is_empty() const;
inline arma_warn_unused bool is_square() const;
inline arma_warn_unused bool is_vec() const;
inline arma_warn_unused bool is_colvec() const;
inline arma_warn_unused bool is_rowvec() const;
inline arma_warn_unused bool is_finite() const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
arma_warn_unused inline bool is_trimatu() const;
arma_warn_unused inline bool is_trimatl() const;
arma_warn_unused inline bool is_diagmat() const;
arma_warn_unused inline bool is_empty() const;
arma_warn_unused inline bool is_square() const;
arma_warn_unused inline bool is_vec() const;
arma_warn_unused inline bool is_colvec() const;
arma_warn_unused inline bool is_rowvec() const;
arma_warn_unused inline bool is_finite() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
inline arma_warn_unused const Op<derived,op_vectorise_col> as_col() const;
inline arma_warn_unused const Op<derived,op_vectorise_row> as_row() const;
arma_warn_unused inline const Op<derived,op_vectorise_col> as_col() const;
arma_warn_unused inline const Op<derived,op_vectorise_row> as_row() const;
};
include/armadillo_bits/Base_meat.hpp
-39
View File
@@ -32,7 +32,6 @@ Base<elem_type,derived>::get_ref() const
template<typename elem_type, typename derived>
arma_cold
inline
void
Base<elem_type,derived>::print(const std::string extra_text) const
@@ -56,7 +55,6 @@ Base<elem_type,derived>::print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
Base<elem_type,derived>::print(std::ostream& user_stream, const std::string extra_text) const
@@ -80,7 +78,6 @@ Base<elem_type,derived>::print(std::ostream& user_stream, const std::string extr
template<typename elem_type, typename derived>
arma_cold
inline
void
Base<elem_type,derived>::raw_print(const std::string extra_text) const
@@ -104,7 +101,6 @@ Base<elem_type,derived>::raw_print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
Base<elem_type,derived>::raw_print(std::ostream& user_stream, const std::string extra_text) const
@@ -128,7 +124,6 @@ Base<elem_type,derived>::raw_print(std::ostream& user_stream, const std::string
template<typename elem_type, typename derived>
arma_cold
inline
void
Base<elem_type,derived>::brief_print(const std::string extra_text) const
@@ -152,7 +147,6 @@ Base<elem_type,derived>::brief_print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
Base<elem_type,derived>::brief_print(std::ostream& user_stream, const std::string extra_text) const
@@ -177,7 +171,6 @@ Base<elem_type,derived>::brief_print(std::ostream& user_stream, const std::strin
template<typename elem_type, typename derived>
inline
arma_warn_unused
elem_type
Base<elem_type,derived>::min() const
{
@@ -188,7 +181,6 @@ Base<elem_type,derived>::min() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
elem_type
Base<elem_type,derived>::max() const
{
@@ -265,7 +257,6 @@ Base<elem_type,derived>::max(uword& row_of_max_val, uword& col_of_max_val) const
template<typename elem_type, typename derived>
inline
arma_warn_unused
uword
Base<elem_type,derived>::index_min() const
{
@@ -289,7 +280,6 @@ Base<elem_type,derived>::index_min() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
uword
Base<elem_type,derived>::index_max() const
{
@@ -313,7 +303,6 @@ Base<elem_type,derived>::index_max() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_symmetric() const
{
@@ -354,7 +343,6 @@ Base<elem_type,derived>::is_symmetric() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_symmetric(const typename get_pod_type<elem_type>::result tol) const
{
@@ -386,7 +374,6 @@ Base<elem_type,derived>::is_symmetric(const typename get_pod_type<elem_type>::re
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_hermitian() const
{
@@ -439,7 +426,6 @@ Base<elem_type,derived>::is_hermitian() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_hermitian(const typename get_pod_type<elem_type>::result tol) const
{
@@ -471,7 +457,6 @@ Base<elem_type,derived>::is_hermitian(const typename get_pod_type<elem_type>::re
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::result tol) const
{
@@ -524,7 +509,6 @@ Base<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::result
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_trimatu() const
{
@@ -543,7 +527,6 @@ Base<elem_type,derived>::is_trimatu() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_trimatl() const
{
@@ -562,7 +545,6 @@ Base<elem_type,derived>::is_trimatl() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_diagmat() const
{
@@ -602,7 +584,6 @@ Base<elem_type,derived>::is_diagmat() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_empty() const
{
@@ -617,7 +598,6 @@ Base<elem_type,derived>::is_empty() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_square() const
{
@@ -632,7 +612,6 @@ Base<elem_type,derived>::is_square() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_vec() const
{
@@ -649,7 +628,6 @@ Base<elem_type,derived>::is_vec() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_colvec() const
{
@@ -666,7 +644,6 @@ Base<elem_type,derived>::is_colvec() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_rowvec() const
{
@@ -683,7 +660,6 @@ Base<elem_type,derived>::is_rowvec() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::is_finite() const
{
@@ -728,7 +704,6 @@ Base<elem_type,derived>::is_finite() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::has_inf() const
{
@@ -773,7 +748,6 @@ Base<elem_type,derived>::has_inf() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base<elem_type,derived>::has_nan() const
{
@@ -818,7 +792,6 @@ Base<elem_type,derived>::has_nan() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const Op<derived,op_vectorise_col>
Base<elem_type, derived>::as_col() const
{
@@ -829,7 +802,6 @@ Base<elem_type, derived>::as_col() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const Op<derived,op_vectorise_row>
Base<elem_type, derived>::as_row() const
{
@@ -843,7 +815,6 @@ Base<elem_type, derived>::as_row() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const Op<derived,op_inv_gen_default>
Base_extra_yes<elem_type, derived>::i() const
{
@@ -854,7 +825,6 @@ Base_extra_yes<elem_type, derived>::i() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base_extra_yes<elem_type,derived>::is_sympd() const
{
@@ -880,7 +850,6 @@ Base_extra_yes<elem_type,derived>::is_sympd() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
Base_extra_yes<elem_type,derived>::is_sympd(typename get_pod_type<elem_type>::result tol) const
{
@@ -908,7 +877,6 @@ Base_extra_yes<elem_type,derived>::is_sympd(typename get_pod_type<elem_type>::re
template<typename elem_type, typename derived>
arma_inline
arma_warn_unused
const derived&
Base_eval_Mat<elem_type, derived>::eval() const
{
@@ -924,7 +892,6 @@ Base_eval_Mat<elem_type, derived>::eval() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
Mat<elem_type>
Base_eval_expr<elem_type, derived>::eval() const
{
@@ -940,7 +907,6 @@ Base_eval_expr<elem_type, derived>::eval() const
template<typename derived>
arma_inline
arma_warn_unused
const Op<derived,op_htrans>
Base_trans_cx<derived>::t() const
{
@@ -951,7 +917,6 @@ Base_trans_cx<derived>::t() const
template<typename derived>
arma_inline
arma_warn_unused
const Op<derived,op_htrans>
Base_trans_cx<derived>::ht() const
{
@@ -962,7 +927,6 @@ Base_trans_cx<derived>::ht() const
template<typename derived>
arma_inline
arma_warn_unused
const Op<derived,op_strans>
Base_trans_cx<derived>::st() const
{
@@ -976,7 +940,6 @@ Base_trans_cx<derived>::st() const
template<typename derived>
arma_inline
arma_warn_unused
const Op<derived,op_htrans>
Base_trans_default<derived>::t() const
{
@@ -987,7 +950,6 @@ Base_trans_default<derived>::t() const
template<typename derived>
arma_inline
arma_warn_unused
const Op<derived,op_htrans>
Base_trans_default<derived>::ht() const
{
@@ -998,7 +960,6 @@ Base_trans_default<derived>::ht() const
template<typename derived>
arma_inline
arma_warn_unused
const Op<derived,op_htrans>
Base_trans_default<derived>::st() const
{
include/armadillo_bits/Col_bones.hpp
+24 -24
View File
@@ -90,11 +90,11 @@ class Col : public Mat<eT>
arma_frown("use braced initialiser list instead") inline mat_injector<Col> operator<<(const eT val);
arma_inline arma_warn_unused const Op<Col<eT>,op_htrans> t() const;
arma_inline arma_warn_unused const Op<Col<eT>,op_htrans> ht() const;
arma_inline arma_warn_unused const Op<Col<eT>,op_strans> st() const;
arma_warn_unused arma_inline const Op<Col<eT>,op_htrans> t() const;
arma_warn_unused arma_inline const Op<Col<eT>,op_htrans> ht() const;
arma_warn_unused arma_inline const Op<Col<eT>,op_strans> st() const;
arma_inline arma_warn_unused const Op<Col<eT>,op_strans> as_row() const;
arma_warn_unused arma_inline const Op<Col<eT>,op_strans> as_row() const;
arma_inline subview_col<eT> row(const uword row_num);
arma_inline const subview_col<eT> row(const uword row_num) const;
@@ -144,11 +144,11 @@ class Col : public Mat<eT>
template<typename T1> inline void insert_rows(const uword row_num, const Base<eT,T1>& X);
arma_inline arma_warn_unused eT& at(const uword i);
arma_inline arma_warn_unused const eT& at(const uword i) const;
arma_warn_unused arma_inline eT& at(const uword i);
arma_warn_unused arma_inline const eT& at(const uword i) const;
arma_inline arma_warn_unused eT& at(const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& at(const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& at(const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& at(const uword in_row, const uword in_col) const;
typedef eT* row_iterator;
@@ -237,26 +237,26 @@ class Col<eT>::fixed : public Col<eT>
template<typename T1, typename T2, typename eglue_type> inline Col& operator=(const eGlue<T1, T2, eglue_type>& X);
#endif
arma_inline arma_warn_unused const Op< Col_fixed_type, op_htrans > t() const;
arma_inline arma_warn_unused const Op< Col_fixed_type, op_htrans > ht() const;
arma_inline arma_warn_unused const Op< Col_fixed_type, op_strans > st() const;
arma_warn_unused arma_inline const Op< Col_fixed_type, op_htrans > t() const;
arma_warn_unused arma_inline const Op< Col_fixed_type, op_htrans > ht() const;
arma_warn_unused arma_inline const Op< Col_fixed_type, op_strans > st() const;
arma_inline arma_warn_unused const eT& at_alt (const uword i) const;
arma_warn_unused arma_inline const eT& at_alt (const uword i) const;
arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused const eT& operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i);
arma_inline arma_warn_unused const eT& at (const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused const eT& operator() (const uword i) const;
arma_warn_unused arma_inline eT& operator[] (const uword i);
arma_warn_unused arma_inline const eT& operator[] (const uword i) const;
arma_warn_unused arma_inline eT& at (const uword i);
arma_warn_unused arma_inline const eT& at (const uword i) const;
arma_warn_unused arma_inline eT& operator() (const uword i);
arma_warn_unused arma_inline const eT& operator() (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused eT* memptr();
arma_inline arma_warn_unused const eT* memptr() const;
arma_warn_unused arma_inline eT* memptr();
arma_warn_unused arma_inline const eT* memptr() const;
arma_hot inline const Col<eT>& fill(const eT val);
arma_hot inline const Col<eT>& zeros();
include/armadillo_bits/Col_meat.hpp
-27
View File
@@ -621,7 +621,6 @@ Col<eT>::operator<<(const eT val)
template<typename eT>
arma_inline
arma_warn_unused
const Op<Col<eT>,op_htrans>
Col<eT>::t() const
{
@@ -632,7 +631,6 @@ Col<eT>::t() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<Col<eT>,op_htrans>
Col<eT>::ht() const
{
@@ -643,7 +641,6 @@ Col<eT>::ht() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<Col<eT>,op_strans>
Col<eT>::st() const
{
@@ -654,7 +651,6 @@ Col<eT>::st() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<Col<eT>,op_strans>
Col<eT>::as_row() const
{
@@ -1123,7 +1119,6 @@ Col<eT>::insert_rows(const uword row_num, const Base<eT,T1>& X)
template<typename eT>
arma_inline
arma_warn_unused
eT&
Col<eT>::at(const uword i)
{
@@ -1134,7 +1129,6 @@ Col<eT>::at(const uword i)
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Col<eT>::at(const uword i) const
{
@@ -1145,7 +1139,6 @@ Col<eT>::at(const uword i) const
template<typename eT>
arma_inline
arma_warn_unused
eT&
Col<eT>::at(const uword in_row, const uword)
{
@@ -1156,7 +1149,6 @@ Col<eT>::at(const uword in_row, const uword)
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Col<eT>::at(const uword in_row, const uword) const
{
@@ -1577,7 +1569,6 @@ Col<eT>::fixed<fixed_n_elem>::operator=(const fixed<fixed_n_elem>& X)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type, op_htrans >
Col<eT>::fixed<fixed_n_elem>::t() const
{
@@ -1589,7 +1580,6 @@ Col<eT>::fixed<fixed_n_elem>::t() const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type, op_htrans >
Col<eT>::fixed<fixed_n_elem>::ht() const
{
@@ -1601,7 +1591,6 @@ Col<eT>::fixed<fixed_n_elem>::ht() const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const Op< typename Col<eT>::template fixed<fixed_n_elem>::Col_fixed_type, op_strans >
Col<eT>::fixed<fixed_n_elem>::st() const
{
@@ -1613,7 +1602,6 @@ Col<eT>::fixed<fixed_n_elem>::st() const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Col<eT>::fixed<fixed_n_elem>::at_alt(const uword ii) const
{
@@ -1635,7 +1623,6 @@ Col<eT>::fixed<fixed_n_elem>::at_alt(const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Col<eT>::fixed<fixed_n_elem>::operator[] (const uword ii)
{
@@ -1647,7 +1634,6 @@ Col<eT>::fixed<fixed_n_elem>::operator[] (const uword ii)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Col<eT>::fixed<fixed_n_elem>::operator[] (const uword ii) const
{
@@ -1659,7 +1645,6 @@ Col<eT>::fixed<fixed_n_elem>::operator[] (const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Col<eT>::fixed<fixed_n_elem>::at(const uword ii)
{
@@ -1671,7 +1656,6 @@ Col<eT>::fixed<fixed_n_elem>::at(const uword ii)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Col<eT>::fixed<fixed_n_elem>::at(const uword ii) const
{
@@ -1683,7 +1667,6 @@ Col<eT>::fixed<fixed_n_elem>::at(const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Col<eT>::fixed<fixed_n_elem>::operator() (const uword ii)
{
@@ -1697,7 +1680,6 @@ Col<eT>::fixed<fixed_n_elem>::operator() (const uword ii)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Col<eT>::fixed<fixed_n_elem>::operator() (const uword ii) const
{
@@ -1711,7 +1693,6 @@ Col<eT>::fixed<fixed_n_elem>::operator() (const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Col<eT>::fixed<fixed_n_elem>::at(const uword in_row, const uword)
{
@@ -1723,7 +1704,6 @@ Col<eT>::fixed<fixed_n_elem>::at(const uword in_row, const uword)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Col<eT>::fixed<fixed_n_elem>::at(const uword in_row, const uword) const
{
@@ -1735,7 +1715,6 @@ Col<eT>::fixed<fixed_n_elem>::at(const uword in_row, const uword) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Col<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col)
{
@@ -1749,7 +1728,6 @@ Col<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Col<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col) const
{
@@ -1763,7 +1741,6 @@ Col<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT*
Col<eT>::fixed<fixed_n_elem>::memptr()
{
@@ -1775,7 +1752,6 @@ Col<eT>::fixed<fixed_n_elem>::memptr()
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT*
Col<eT>::fixed<fixed_n_elem>::memptr() const
{
@@ -1786,7 +1762,6 @@ Col<eT>::fixed<fixed_n_elem>::memptr() const
template<typename eT>
template<uword fixed_n_elem>
arma_hot
inline
const Col<eT>&
Col<eT>::fixed<fixed_n_elem>::fill(const eT val)
@@ -1804,7 +1779,6 @@ Col<eT>::fixed<fixed_n_elem>::fill(const eT val)
template<typename eT>
template<uword fixed_n_elem>
arma_hot
inline
const Col<eT>&
Col<eT>::fixed<fixed_n_elem>::zeros()
@@ -1822,7 +1796,6 @@ Col<eT>::fixed<fixed_n_elem>::zeros()
template<typename eT>
template<uword fixed_n_elem>
arma_hot
inline
const Col<eT>&
Col<eT>::fixed<fixed_n_elem>::ones()
include/armadillo_bits/Cube_bones.hpp
+53 -53
View File
@@ -282,27 +282,27 @@ class Cube : public BaseCube< eT, Cube<eT> >
template<typename T1, typename T2, typename glue_type> inline Cube& operator/=(const mtGlueCube<eT, T1, T2, glue_type>& X);
arma_inline arma_warn_unused const eT& at_alt (const uword i) const;
arma_warn_unused arma_inline const eT& at_alt (const uword i) const;
arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused const eT& operator[] (const uword i) const;
arma_warn_unused arma_inline eT& operator[] (const uword i);
arma_warn_unused arma_inline const eT& operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at(const uword i);
arma_inline arma_warn_unused const eT& at(const uword i) const;
arma_warn_unused arma_inline eT& at(const uword i);
arma_warn_unused arma_inline const eT& at(const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused const eT& operator() (const uword i) const;
arma_warn_unused arma_inline eT& operator() (const uword i);
arma_warn_unused arma_inline const eT& operator() (const uword i) const;
#if defined(__cpp_multidimensional_subscript)
arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col, const uword in_slice);
arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col, const uword in_slice);
arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const;
#endif
arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col, const uword in_slice);
arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col, const uword in_slice);
arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col, const uword in_slice) const;
arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col, const uword in_slice);
arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col, const uword in_slice);
arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const;
arma_inline const Cube& operator++();
arma_inline void operator++(int);
@@ -310,29 +310,29 @@ class Cube : public BaseCube< eT, Cube<eT> >
arma_inline const Cube& operator--();
arma_inline void operator--(int);
inline arma_warn_unused bool is_finite() const;
arma_inline arma_warn_unused bool is_empty() const;
arma_warn_unused inline bool is_finite() const;
arma_warn_unused arma_inline bool is_empty() const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
inline arma_warn_unused bool has_nonfinite() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
arma_warn_unused inline bool has_nonfinite() const;
arma_inline arma_warn_unused bool in_range(const uword i) const;
arma_inline arma_warn_unused bool in_range(const span& x) const;
arma_warn_unused arma_inline bool in_range(const uword i) const;
arma_warn_unused arma_inline bool in_range(const span& x) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice) const;
inline arma_warn_unused bool in_range(const span& row_span, const span& col_span, const span& slice_span) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused inline bool in_range(const span& row_span, const span& col_span, const span& slice_span) const;
inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const;
arma_warn_unused inline bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const;
arma_inline arma_warn_unused eT* memptr();
arma_inline arma_warn_unused const eT* memptr() const;
arma_warn_unused arma_inline eT* memptr();
arma_warn_unused arma_inline const eT* memptr() const;
arma_inline arma_warn_unused eT* slice_memptr(const uword slice);
arma_inline arma_warn_unused const eT* slice_memptr(const uword slice) const;
arma_warn_unused arma_inline eT* slice_memptr(const uword slice);
arma_warn_unused arma_inline const eT* slice_memptr(const uword slice) const;
arma_inline arma_warn_unused eT* slice_colptr(const uword in_slice, const uword in_col);
arma_inline arma_warn_unused const eT* slice_colptr(const uword in_slice, const uword in_col) const;
arma_warn_unused arma_inline eT* slice_colptr(const uword in_slice, const uword in_col);
arma_warn_unused arma_inline const eT* slice_colptr(const uword in_slice, const uword in_col) const;
inline void set_size(const uword new_n_rows, const uword new_n_cols, const uword new_n_slices);
inline void set_size(const SizeCube& s);
@@ -384,8 +384,8 @@ class Cube : public BaseCube< eT, Cube<eT> >
template<typename T1> inline void set_imag(const BaseCube<pod_type,T1>& X);
inline arma_warn_unused eT min() const;
inline arma_warn_unused eT max() const;
arma_warn_unused inline eT min() const;
arma_warn_unused inline eT max() const;
inline eT min(uword& index_of_min_val) const;
inline eT max(uword& index_of_max_val) const;
@@ -394,13 +394,13 @@ class Cube : public BaseCube< eT, Cube<eT> >
inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const;
inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const;
inline arma_cold bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const;
inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) const;
arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const;
arma_cold inline bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const;
arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const;
inline arma_cold bool load(const std::string name, const file_type type = auto_detect);
inline arma_cold bool load(const hdf5_name& spec, const file_type type = hdf5_binary);
inline arma_cold bool load( std::istream& is, const file_type type = auto_detect);
arma_cold inline bool load(const std::string name, const file_type type = auto_detect);
arma_cold inline bool load(const hdf5_name& spec, const file_type type = hdf5_binary);
arma_cold inline bool load( std::istream& is, const file_type type = auto_detect);
arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const;
arma_deprecated inline bool quiet_save(const hdf5_name& spec, const file_type type = hdf5_binary) const;
@@ -437,11 +437,11 @@ class Cube : public BaseCube< eT, Cube<eT> >
inline bool empty() const;
inline uword size() const;
inline arma_warn_unused eT& front();
inline arma_warn_unused const eT& front() const;
arma_warn_unused inline eT& front();
arma_warn_unused inline const eT& front() const;
inline arma_warn_unused eT& back();
inline arma_warn_unused const eT& back() const;
arma_warn_unused inline eT& back();
arma_warn_unused inline const eT& back() const;
inline void swap(Cube& B);
@@ -513,25 +513,25 @@ class Cube<eT>::fixed : public Cube<eT>
inline Cube& operator=(const fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>& X);
arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused const eT& operator[] (const uword i) const;
arma_warn_unused arma_inline eT& operator[] (const uword i);
arma_warn_unused arma_inline const eT& operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i);
arma_inline arma_warn_unused const eT& at (const uword i) const;
arma_warn_unused arma_inline eT& at (const uword i);
arma_warn_unused arma_inline const eT& at (const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused const eT& operator() (const uword i) const;
arma_warn_unused arma_inline eT& operator() (const uword i);
arma_warn_unused arma_inline const eT& operator() (const uword i) const;
#if defined(__cpp_multidimensional_subscript)
arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col, const uword in_slice);
arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col, const uword in_slice);
arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const;
#endif
arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col, const uword in_slice);
arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col, const uword in_slice);
arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col, const uword in_slice) const;
arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col, const uword in_slice);
arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col, const uword in_slice);
arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const;
};
include/armadillo_bits/Cube_meat.hpp
+4 -57
View File
@@ -3414,7 +3414,6 @@ Cube<eT>::operator/=(const mtGlueCube<eT, T1, T2, glue_type>& X)
//! linear element accessor (treats the cube as a vector); no bounds check; assumes memory is aligned
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::at_alt(const uword i) const
{
@@ -3430,7 +3429,6 @@ Cube<eT>::at_alt(const uword i) const
//! linear element accessor (treats the cube as a vector); bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
eT&
Cube<eT>::operator() (const uword i)
{
@@ -3444,7 +3442,6 @@ Cube<eT>::operator() (const uword i)
//! linear element accessor (treats the cube as a vector); bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::operator() (const uword i) const
{
@@ -3457,7 +3454,6 @@ Cube<eT>::operator() (const uword i) const
//! linear element accessor (treats the cube as a vector); no bounds check.
template<typename eT>
arma_inline
arma_warn_unused
eT&
Cube<eT>::operator[] (const uword i)
{
@@ -3469,7 +3465,6 @@ Cube<eT>::operator[] (const uword i)
//! linear element accessor (treats the cube as a vector); no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::operator[] (const uword i) const
{
@@ -3481,7 +3476,6 @@ Cube<eT>::operator[] (const uword i) const
//! linear element accessor (treats the cube as a vector); no bounds check.
template<typename eT>
arma_inline
arma_warn_unused
eT&
Cube<eT>::at(const uword i)
{
@@ -3493,7 +3487,6 @@ Cube<eT>::at(const uword i)
//! linear element accessor (treats the cube as a vector); no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::at(const uword i) const
{
@@ -3505,7 +3498,6 @@ Cube<eT>::at(const uword i) const
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
eT&
Cube<eT>::operator() (const uword in_row, const uword in_col, const uword in_slice)
{
@@ -3526,7 +3518,6 @@ Cube<eT>::operator() (const uword in_row, const uword in_col, const uword in_sli
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::operator() (const uword in_row, const uword in_col, const uword in_slice) const
{
@@ -3549,8 +3540,7 @@ Cube<eT>::operator() (const uword in_row, const uword in_col, const uword in_sli
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
eT&
eT&
Cube<eT>::operator[] (const uword in_row, const uword in_col, const uword in_slice)
{
return access::rw( mem[in_slice*n_elem_slice + in_col*n_rows + in_row] );
@@ -3561,8 +3551,7 @@ Cube<eT>::operator() (const uword in_row, const uword in_col, const uword in_sli
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
const eT&
Cube<eT>::operator[] (const uword in_row, const uword in_col, const uword in_slice) const
{
return mem[in_slice*n_elem_slice + in_col*n_rows + in_row];
@@ -3575,7 +3564,6 @@ Cube<eT>::operator() (const uword in_row, const uword in_col, const uword in_sli
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
eT&
Cube<eT>::at(const uword in_row, const uword in_col, const uword in_slice)
{
@@ -3587,7 +3575,6 @@ Cube<eT>::at(const uword in_row, const uword in_col, const uword in_slice)
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::at(const uword in_row, const uword in_col, const uword in_slice) const
{
@@ -3646,7 +3633,6 @@ Cube<eT>::operator--(int)
//! returns true if all of the elements are finite
template<typename eT>
inline
arma_warn_unused
bool
Cube<eT>::is_finite() const
{
@@ -3660,7 +3646,6 @@ Cube<eT>::is_finite() const
//! returns true if the cube has no elements
template<typename eT>
arma_inline
arma_warn_unused
bool
Cube<eT>::is_empty() const
{
@@ -3671,7 +3656,6 @@ Cube<eT>::is_empty() const
template<typename eT>
inline
arma_warn_unused
bool
Cube<eT>::has_inf() const
{
@@ -3684,7 +3668,6 @@ Cube<eT>::has_inf() const
template<typename eT>
inline
arma_warn_unused
bool
Cube<eT>::has_nan() const
{
@@ -3697,7 +3680,6 @@ Cube<eT>::has_nan() const
template<typename eT>
inline
arma_warn_unused
bool
Cube<eT>::has_nonfinite() const
{
@@ -3711,7 +3693,6 @@ Cube<eT>::has_nonfinite() const
//! returns true if the given index is currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
Cube<eT>::in_range(const uword i) const
{
@@ -3723,7 +3704,6 @@ Cube<eT>::in_range(const uword i) const
//! returns true if the given start and end indices are currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
Cube<eT>::in_range(const span& x) const
{
@@ -3747,7 +3727,6 @@ Cube<eT>::in_range(const span& x) const
//! returns true if the given location is currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
Cube<eT>::in_range(const uword in_row, const uword in_col, const uword in_slice) const
{
@@ -3758,7 +3737,6 @@ Cube<eT>::in_range(const uword in_row, const uword in_col, const uword in_slice)
template<typename eT>
inline
arma_warn_unused
bool
Cube<eT>::in_range(const span& row_span, const span& col_span, const span& slice_span) const
{
@@ -3786,7 +3764,6 @@ Cube<eT>::in_range(const span& row_span, const span& col_span, const span& slice
template<typename eT>
inline
arma_warn_unused
bool
Cube<eT>::in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const
{
@@ -3812,7 +3789,6 @@ Cube<eT>::in_range(const uword in_row, const uword in_col, const uword in_slice,
//! returns a pointer to array of eTs used by the cube
template<typename eT>
arma_inline
arma_warn_unused
eT*
Cube<eT>::memptr()
{
@@ -3824,7 +3800,6 @@ Cube<eT>::memptr()
//! returns a pointer to array of eTs used by the cube
template<typename eT>
arma_inline
arma_warn_unused
const eT*
Cube<eT>::memptr() const
{
@@ -3836,7 +3811,6 @@ Cube<eT>::memptr() const
//! returns a pointer to array of eTs used by the specified slice in the cube
template<typename eT>
arma_inline
arma_warn_unused
eT*
Cube<eT>::slice_memptr(const uword uslice)
{
@@ -3848,7 +3822,6 @@ Cube<eT>::slice_memptr(const uword uslice)
//! returns a pointer to array of eTs used by the specified slice in the cube
template<typename eT>
arma_inline
arma_warn_unused
const eT*
Cube<eT>::slice_memptr(const uword uslice) const
{
@@ -3860,7 +3833,6 @@ Cube<eT>::slice_memptr(const uword uslice) const
//! returns a pointer to array of eTs used by the specified slice in the cube
template<typename eT>
arma_inline
arma_warn_unused
eT*
Cube<eT>::slice_colptr(const uword uslice, const uword col)
{
@@ -3872,7 +3844,6 @@ Cube<eT>::slice_colptr(const uword uslice, const uword col)
//! returns a pointer to array of eTs used by the specified slice in the cube
template<typename eT>
arma_inline
arma_warn_unused
const eT*
Cube<eT>::slice_colptr(const uword uslice, const uword col) const
{
@@ -4387,7 +4358,6 @@ Cube<eT>::set_imag(const BaseCube<typename Cube<eT>::pod_type,T1>& X)
template<typename eT>
inline
arma_warn_unused
eT
Cube<eT>::min() const
{
@@ -4407,7 +4377,6 @@ Cube<eT>::min() const
template<typename eT>
inline
arma_warn_unused
eT
Cube<eT>::max() const
{
@@ -4540,7 +4509,6 @@ Cube<eT>::max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_
//! save the cube to a file
template<typename eT>
inline
arma_cold
bool
Cube<eT>::save(const std::string name, const file_type type) const
{
@@ -4592,7 +4560,6 @@ Cube<eT>::save(const std::string name, const file_type type) const
template<typename eT>
inline
arma_cold
bool
Cube<eT>::save(const hdf5_name& spec, const file_type type) const
{
@@ -4652,7 +4619,6 @@ Cube<eT>::save(const hdf5_name& spec, const file_type type) const
//! save the cube to a stream
template<typename eT>
inline
arma_cold
bool
Cube<eT>::save(std::ostream& os, const file_type type) const
{
@@ -4697,7 +4663,6 @@ Cube<eT>::save(std::ostream& os, const file_type type) const
//! load a cube from a file
template<typename eT>
inline
arma_cold
bool
Cube<eT>::load(const std::string name, const file_type type)
{
@@ -4766,7 +4731,6 @@ Cube<eT>::load(const std::string name, const file_type type)
template<typename eT>
inline
arma_cold
bool
Cube<eT>::load(const hdf5_name& spec, const file_type type)
{
@@ -4819,7 +4783,6 @@ Cube<eT>::load(const hdf5_name& spec, const file_type type)
//! load a cube from a stream
template<typename eT>
inline
arma_cold
bool
Cube<eT>::load(std::istream& is, const file_type type)
{
@@ -5113,7 +5076,6 @@ Cube<eT>::size() const
template<typename eT>
inline
arma_warn_unused
eT&
Cube<eT>::front()
{
@@ -5126,7 +5088,6 @@ Cube<eT>::front()
template<typename eT>
inline
arma_warn_unused
const eT&
Cube<eT>::front() const
{
@@ -5139,7 +5100,6 @@ Cube<eT>::front() const
template<typename eT>
inline
arma_warn_unused
eT&
Cube<eT>::back()
{
@@ -5152,7 +5112,6 @@ Cube<eT>::back()
template<typename eT>
inline
arma_warn_unused
const eT&
Cube<eT>::back() const
{
@@ -5482,7 +5441,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator=(const fix
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator[] (const uword i)
{
@@ -5494,7 +5452,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator[] (const u
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator[] (const uword i) const
{
@@ -5506,7 +5463,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator[] (const u
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword i)
{
@@ -5518,7 +5474,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword i)
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword i) const
{
@@ -5530,7 +5485,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword i) c
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const uword i)
{
@@ -5544,7 +5498,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const u
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const uword i) const
{
@@ -5560,8 +5513,7 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const u
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
eT&
eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator[] (const uword in_row, const uword in_col, const uword in_slice)
{
const uword i = in_slice*fixed_n_elem_slice + in_col*fixed_n_rows + in_row;
@@ -5574,8 +5526,7 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const u
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
const eT&
const eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator[] (const uword in_row, const uword in_col, const uword in_slice) const
{
const uword i = in_slice*fixed_n_elem_slice + in_col*fixed_n_rows + in_row;
@@ -5590,7 +5541,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const u
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword in_row, const uword in_col, const uword in_slice)
{
@@ -5604,7 +5554,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword in_r
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword in_row, const uword in_col, const uword in_slice) const
{
@@ -5618,7 +5567,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::at(const uword in_r
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const uword in_row, const uword in_col, const uword in_slice)
{
@@ -5641,7 +5589,6 @@ Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const u
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols, uword fixed_n_slices>
arma_inline
arma_warn_unused
const eT&
Cube<eT>::fixed<fixed_n_rows, fixed_n_cols, fixed_n_slices>::operator() (const uword in_row, const uword in_col, const uword in_slice) const
{
include/armadillo_bits/MapMat_bones.hpp
+21 -21
View File
@@ -81,23 +81,23 @@ class MapMat
inline void speye(const uword in_n_rows, const uword in_n_cols);
inline void speye(const SizeMat& s);
arma_inline arma_warn_unused MapMat_val<eT> operator[](const uword index);
inline arma_warn_unused eT operator[](const uword index) const;
arma_warn_unused arma_inline MapMat_val<eT> operator[](const uword index);
arma_warn_unused inline eT operator[](const uword index) const;
arma_inline arma_warn_unused MapMat_val<eT> operator()(const uword index);
inline arma_warn_unused eT operator()(const uword index) const;
arma_warn_unused arma_inline MapMat_val<eT> operator()(const uword index);
arma_warn_unused inline eT operator()(const uword index) const;
arma_inline arma_warn_unused MapMat_val<eT> at(const uword in_row, const uword in_col);
inline arma_warn_unused eT at(const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline MapMat_val<eT> at(const uword in_row, const uword in_col);
arma_warn_unused inline eT at(const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused MapMat_val<eT> operator()(const uword in_row, const uword in_col);
inline arma_warn_unused eT operator()(const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline MapMat_val<eT> operator()(const uword in_row, const uword in_col);
arma_warn_unused inline eT operator()(const uword in_row, const uword in_col) const;
inline arma_warn_unused bool is_empty() const;
inline arma_warn_unused bool is_vec() const;
inline arma_warn_unused bool is_rowvec() const;
inline arma_warn_unused bool is_colvec() const;
inline arma_warn_unused bool is_square() const;
arma_warn_unused inline bool is_empty() const;
arma_warn_unused inline bool is_vec() const;
arma_warn_unused inline bool is_rowvec() const;
arma_warn_unused inline bool is_colvec() const;
arma_warn_unused inline bool is_square() const;
inline void sprandu(const uword in_n_rows, const uword in_n_cols, const double density);
@@ -195,11 +195,11 @@ class SpMat_MapMat_val
inline SpMat_MapMat_val<eT>& operator*=(const eT in_val);
inline SpMat_MapMat_val<eT>& operator/=(const eT in_val);
inline SpMat_MapMat_val<eT>& operator++();
inline arma_warn_unused eT operator++(int);
inline SpMat_MapMat_val<eT>& operator++();
arma_warn_unused inline eT operator++(int);
inline SpMat_MapMat_val<eT>& operator--();
inline arma_warn_unused eT operator--(int);
inline SpMat_MapMat_val<eT>& operator--();
arma_warn_unused inline eT operator--(int);
inline void set(const eT in_val);
inline void add(const eT in_val);
@@ -235,11 +235,11 @@ class SpSubview_MapMat_val : public SpMat_MapMat_val<eT>
inline SpSubview_MapMat_val<eT>& operator*=(const eT in_val);
inline SpSubview_MapMat_val<eT>& operator/=(const eT in_val);
inline SpSubview_MapMat_val<eT>& operator++();
inline arma_warn_unused eT operator++(int);
inline SpSubview_MapMat_val<eT>& operator++();
arma_warn_unused inline eT operator++(int);
inline SpSubview_MapMat_val<eT>& operator--();
inline arma_warn_unused eT operator--(int);
inline SpSubview_MapMat_val<eT>& operator--();
arma_warn_unused inline eT operator--(int);
};
include/armadillo_bits/MapMat_meat.hpp
-17
View File
@@ -408,7 +408,6 @@ MapMat<eT>::speye(const SizeMat& s)
template<typename eT>
arma_inline
arma_warn_unused
MapMat_val<eT>
MapMat<eT>::operator[](const uword index)
{
@@ -419,7 +418,6 @@ MapMat<eT>::operator[](const uword index)
template<typename eT>
inline
arma_warn_unused
eT
MapMat<eT>::operator[](const uword index) const
{
@@ -435,7 +433,6 @@ MapMat<eT>::operator[](const uword index) const
template<typename eT>
arma_inline
arma_warn_unused
MapMat_val<eT>
MapMat<eT>::operator()(const uword index)
{
@@ -448,7 +445,6 @@ MapMat<eT>::operator()(const uword index)
template<typename eT>
inline
arma_warn_unused
eT
MapMat<eT>::operator()(const uword index) const
{
@@ -466,7 +462,6 @@ MapMat<eT>::operator()(const uword index) const
template<typename eT>
arma_inline
arma_warn_unused
MapMat_val<eT>
MapMat<eT>::at(const uword in_row, const uword in_col)
{
@@ -479,7 +474,6 @@ MapMat<eT>::at(const uword in_row, const uword in_col)
template<typename eT>
inline
arma_warn_unused
eT
MapMat<eT>::at(const uword in_row, const uword in_col) const
{
@@ -497,7 +491,6 @@ MapMat<eT>::at(const uword in_row, const uword in_col) const
template<typename eT>
arma_inline
arma_warn_unused
MapMat_val<eT>
MapMat<eT>::operator()(const uword in_row, const uword in_col)
{
@@ -512,7 +505,6 @@ MapMat<eT>::operator()(const uword in_row, const uword in_col)
template<typename eT>
inline
arma_warn_unused
eT
MapMat<eT>::operator()(const uword in_row, const uword in_col) const
{
@@ -532,7 +524,6 @@ MapMat<eT>::operator()(const uword in_row, const uword in_col) const
template<typename eT>
inline
arma_warn_unused
bool
MapMat<eT>::is_empty() const
{
@@ -543,7 +534,6 @@ MapMat<eT>::is_empty() const
template<typename eT>
inline
arma_warn_unused
bool
MapMat<eT>::is_vec() const
{
@@ -554,7 +544,6 @@ MapMat<eT>::is_vec() const
template<typename eT>
inline
arma_warn_unused
bool
MapMat<eT>::is_rowvec() const
{
@@ -566,7 +555,6 @@ MapMat<eT>::is_rowvec() const
//! returns true if the object can be interpreted as a column vector
template<typename eT>
inline
arma_warn_unused
bool
MapMat<eT>::is_colvec() const
{
@@ -577,7 +565,6 @@ MapMat<eT>::is_colvec() const
template<typename eT>
inline
arma_warn_unused
bool
MapMat<eT>::is_square() const
{
@@ -1343,7 +1330,6 @@ SpMat_MapMat_val<eT>::operator++()
template<typename eT>
inline
arma_warn_unused
eT
SpMat_MapMat_val<eT>::operator++(int)
{
@@ -1372,7 +1358,6 @@ SpMat_MapMat_val<eT>::operator--()
template<typename eT>
inline
arma_warn_unused
eT
SpMat_MapMat_val<eT>::operator--(int)
{
@@ -1735,7 +1720,6 @@ SpSubview_MapMat_val<eT>::operator++()
template<typename eT>
inline
arma_warn_unused
eT
SpSubview_MapMat_val<eT>::operator++(int)
{
@@ -1774,7 +1758,6 @@ SpSubview_MapMat_val<eT>::operator--()
template<typename eT>
inline
arma_warn_unused
eT
SpSubview_MapMat_val<eT>::operator--(int)
{
include/armadillo_bits/Mat_bones.hpp
+118 -118
View File
@@ -72,11 +72,11 @@ class Mat : public Base< eT, Mat<eT> >
inline Mat(const uword in_n_rows, const uword in_n_cols, const fill::scalar_holder<eT> f);
inline Mat(const SizeMat& s, const fill::scalar_holder<eT> f);
inline arma_cold Mat(const char* text);
inline arma_cold Mat& operator=(const char* text);
arma_cold inline Mat(const char* text);
arma_cold inline Mat& operator=(const char* text);
inline arma_cold Mat(const std::string& text);
inline arma_cold Mat& operator=(const std::string& text);
arma_cold inline Mat(const std::string& text);
arma_cold inline Mat& operator=(const std::string& text);
inline Mat(const std::vector<eT>& x);
inline Mat& operator=(const std::vector<eT>& x);
@@ -394,24 +394,24 @@ class Mat : public Base< eT, Mat<eT> >
template<typename T1, typename T2, typename glue_type> inline Mat& operator/=(const mtGlue<eT, T1, T2, glue_type>& X);
arma_inline arma_warn_unused const eT& at_alt (const uword ii) const;
arma_warn_unused arma_inline const eT& at_alt (const uword ii) const;
arma_inline arma_warn_unused eT& operator[] (const uword ii);
arma_inline arma_warn_unused const eT& operator[] (const uword ii) const;
arma_inline arma_warn_unused eT& at (const uword ii);
arma_inline arma_warn_unused const eT& at (const uword ii) const;
arma_inline arma_warn_unused eT& operator() (const uword ii);
arma_inline arma_warn_unused const eT& operator() (const uword ii) const;
arma_warn_unused arma_inline eT& operator[] (const uword ii);
arma_warn_unused arma_inline const eT& operator[] (const uword ii) const;
arma_warn_unused arma_inline eT& at (const uword ii);
arma_warn_unused arma_inline const eT& at (const uword ii) const;
arma_warn_unused arma_inline eT& operator() (const uword ii);
arma_warn_unused arma_inline const eT& operator() (const uword ii) const;
#if defined(__cpp_multidimensional_subscript)
arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col) const;
#endif
arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const;
arma_inline const Mat& operator++();
arma_inline void operator++(int);
@@ -419,38 +419,38 @@ class Mat : public Base< eT, Mat<eT> >
arma_inline const Mat& operator--();
arma_inline void operator--(int);
arma_inline arma_warn_unused bool is_empty() const;
arma_inline arma_warn_unused bool is_vec() const;
arma_inline arma_warn_unused bool is_rowvec() const;
arma_inline arma_warn_unused bool is_colvec() const;
arma_inline arma_warn_unused bool is_square() const;
inline arma_warn_unused bool is_finite() const;
arma_warn_unused arma_inline bool is_empty() const;
arma_warn_unused arma_inline bool is_vec() const;
arma_warn_unused arma_inline bool is_rowvec() const;
arma_warn_unused arma_inline bool is_colvec() const;
arma_warn_unused arma_inline bool is_square() const;
arma_warn_unused inline bool is_finite() const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
inline arma_warn_unused bool has_nonfinite() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
arma_warn_unused inline bool has_nonfinite() const;
inline arma_warn_unused bool is_sorted(const char* direction = "ascend") const;
inline arma_warn_unused bool is_sorted(const char* direction, const uword dim) const;
arma_warn_unused inline bool is_sorted(const char* direction = "ascend") const;
arma_warn_unused inline bool is_sorted(const char* direction, const uword dim) const;
template<typename comparator>
inline arma_warn_unused bool is_sorted_helper(const comparator& comp, const uword dim) const;
arma_warn_unused inline bool is_sorted_helper(const comparator& comp, const uword dim) const;
arma_inline arma_warn_unused bool in_range(const uword ii) const;
arma_inline arma_warn_unused bool in_range(const span& x ) const;
arma_warn_unused arma_inline bool in_range(const uword ii) const;
arma_warn_unused arma_inline bool in_range(const span& x ) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused bool in_range(const span& row_span, const uword in_col) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const span& col_span) const;
arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline bool in_range(const span& row_span, const uword in_col) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const span& col_span) const;
arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const;
arma_inline arma_warn_unused eT* colptr(const uword in_col);
arma_inline arma_warn_unused const eT* colptr(const uword in_col) const;
arma_warn_unused arma_inline eT* colptr(const uword in_col);
arma_warn_unused arma_inline const eT* colptr(const uword in_col) const;
arma_inline arma_warn_unused eT* memptr();
arma_inline arma_warn_unused const eT* memptr() const;
arma_warn_unused arma_inline eT* memptr();
arma_warn_unused arma_inline const eT* memptr() const;
template<typename eT2, typename expr>
@@ -512,16 +512,16 @@ class Mat : public Base< eT, Mat<eT> >
inline const Mat& eye(const uword new_n_rows, const uword new_n_cols);
inline const Mat& eye(const SizeMat& s);
inline arma_cold void reset();
inline arma_cold void soft_reset();
arma_cold inline void reset();
arma_cold inline void soft_reset();
template<typename T1> inline void set_real(const Base<pod_type,T1>& X);
template<typename T1> inline void set_imag(const Base<pod_type,T1>& X);
inline arma_warn_unused eT min() const;
inline arma_warn_unused eT max() const;
arma_warn_unused inline eT min() const;
arma_warn_unused inline eT max() const;
inline eT min(uword& index_of_min_val) const;
inline eT max(uword& index_of_max_val) const;
@@ -530,15 +530,15 @@ class Mat : public Base< eT, Mat<eT> >
inline eT max(uword& row_of_max_val, uword& col_of_max_val) const;
inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const;
inline arma_cold bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const;
inline arma_cold bool save(const csv_name& spec, const file_type type = csv_ascii) const;
inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) const;
arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const;
arma_cold inline bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const;
arma_cold inline bool save(const csv_name& spec, const file_type type = csv_ascii) const;
arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const;
inline arma_cold bool load(const std::string name, const file_type type = auto_detect);
inline arma_cold bool load(const hdf5_name& spec, const file_type type = hdf5_binary);
inline arma_cold bool load(const csv_name& spec, const file_type type = csv_ascii);
inline arma_cold bool load( std::istream& is, const file_type type = auto_detect);
arma_cold inline bool load(const std::string name, const file_type type = auto_detect);
arma_cold inline bool load(const hdf5_name& spec, const file_type type = hdf5_binary);
arma_cold inline bool load(const csv_name& spec, const file_type type = csv_ascii);
arma_cold inline bool load( std::istream& is, const file_type type = auto_detect);
arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const;
arma_deprecated inline bool quiet_save(const hdf5_name& spec, const file_type type = hdf5_binary) const;
@@ -572,18 +572,18 @@ class Mat : public Base< eT, Mat<eT> >
inline row_iterator(const row_iterator& X);
inline row_iterator(Mat<eT>& in_M, const uword in_row, const uword in_col);
inline arma_warn_unused eT& operator* ();
arma_warn_unused inline eT& operator* ();
inline row_iterator& operator++();
inline arma_warn_unused row_iterator operator++(int);
inline row_iterator& operator++();
arma_warn_unused inline row_iterator operator++(int);
inline row_iterator& operator--();
inline arma_warn_unused row_iterator operator--(int);
inline row_iterator& operator--();
arma_warn_unused inline row_iterator operator--(int);
inline arma_warn_unused bool operator!=(const row_iterator& X) const;
inline arma_warn_unused bool operator==(const row_iterator& X) const;
inline arma_warn_unused bool operator!=(const const_row_iterator& X) const;
inline arma_warn_unused bool operator==(const const_row_iterator& X) const;
arma_warn_unused inline bool operator!=(const row_iterator& X) const;
arma_warn_unused inline bool operator==(const row_iterator& X) const;
arma_warn_unused inline bool operator!=(const const_row_iterator& X) const;
arma_warn_unused inline bool operator==(const const_row_iterator& X) const;
typedef std::bidirectional_iterator_tag iterator_category;
typedef eT value_type;
@@ -606,18 +606,18 @@ class Mat : public Base< eT, Mat<eT> >
inline const_row_iterator(const const_row_iterator& X);
inline const_row_iterator(const Mat<eT>& in_M, const uword in_row, const uword in_col);
inline arma_warn_unused const eT& operator*() const;
arma_warn_unused inline const eT& operator*() const;
inline const_row_iterator& operator++();
inline arma_warn_unused const_row_iterator operator++(int);
inline const_row_iterator& operator++();
arma_warn_unused inline const_row_iterator operator++(int);
inline const_row_iterator& operator--();
inline arma_warn_unused const_row_iterator operator--(int);
inline const_row_iterator& operator--();
arma_warn_unused inline const_row_iterator operator--(int);
inline arma_warn_unused bool operator!=(const row_iterator& X) const;
inline arma_warn_unused bool operator==(const row_iterator& X) const;
inline arma_warn_unused bool operator!=(const const_row_iterator& X) const;
inline arma_warn_unused bool operator==(const const_row_iterator& X) const;
arma_warn_unused inline bool operator!=(const row_iterator& X) const;
arma_warn_unused inline bool operator==(const row_iterator& X) const;
arma_warn_unused inline bool operator!=(const const_row_iterator& X) const;
arma_warn_unused inline bool operator==(const const_row_iterator& X) const;
typedef std::bidirectional_iterator_tag iterator_category;
typedef eT value_type;
@@ -641,21 +641,21 @@ class Mat : public Base< eT, Mat<eT> >
inline row_col_iterator(const row_col_iterator& in_it);
inline row_col_iterator(Mat<eT>& in_M, const uword row = 0, const uword col = 0);
inline arma_warn_unused eT& operator*();
arma_warn_unused inline eT& operator*();
inline row_col_iterator& operator++();
inline arma_warn_unused row_col_iterator operator++(int);
inline row_col_iterator& operator++();
arma_warn_unused inline row_col_iterator operator++(int);
inline row_col_iterator& operator--();
inline arma_warn_unused row_col_iterator operator--(int);
inline row_col_iterator& operator--();
arma_warn_unused inline row_col_iterator operator--(int);
inline arma_warn_unused uword row() const;
inline arma_warn_unused uword col() const;
arma_warn_unused inline uword row() const;
arma_warn_unused inline uword col() const;
inline arma_warn_unused bool operator==(const row_col_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const row_col_iterator& rhs) const;
inline arma_warn_unused bool operator==(const const_row_col_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const const_row_col_iterator& rhs) const;
arma_warn_unused inline bool operator==(const row_col_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const row_col_iterator& rhs) const;
arma_warn_unused inline bool operator==(const const_row_col_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const const_row_col_iterator& rhs) const;
typedef std::bidirectional_iterator_tag iterator_category;
typedef eT value_type;
@@ -679,21 +679,21 @@ class Mat : public Base< eT, Mat<eT> >
inline const_row_col_iterator(const const_row_col_iterator& in_it);
inline const_row_col_iterator(const Mat<eT>& in_M, const uword row = 0, const uword col = 0);
inline arma_warn_unused const eT& operator*() const;
arma_warn_unused inline const eT& operator*() const;
inline const_row_col_iterator& operator++();
inline arma_warn_unused const_row_col_iterator operator++(int);
inline const_row_col_iterator& operator++();
arma_warn_unused inline const_row_col_iterator operator++(int);
inline const_row_col_iterator& operator--();
inline arma_warn_unused const_row_col_iterator operator--(int);
inline const_row_col_iterator& operator--();
arma_warn_unused inline const_row_col_iterator operator--(int);
inline arma_warn_unused uword row() const;
inline arma_warn_unused uword col() const;
arma_warn_unused inline uword row() const;
arma_warn_unused inline uword col() const;
inline arma_warn_unused bool operator==(const const_row_col_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const const_row_col_iterator& rhs) const;
inline arma_warn_unused bool operator==(const row_col_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const row_col_iterator& rhs) const;
arma_warn_unused inline bool operator==(const const_row_col_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const const_row_col_iterator& rhs) const;
arma_warn_unused inline bool operator==(const row_col_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const row_col_iterator& rhs) const;
// So that we satisfy the STL iterator types.
typedef std::bidirectional_iterator_tag iterator_category;
@@ -740,11 +740,11 @@ class Mat : public Base< eT, Mat<eT> >
inline bool empty() const;
inline uword size() const;
inline arma_warn_unused eT& front();
inline arma_warn_unused const eT& front() const;
arma_warn_unused inline eT& front();
arma_warn_unused inline const eT& front() const;
inline arma_warn_unused eT& back();
inline arma_warn_unused const eT& back() const;
arma_warn_unused inline eT& back();
arma_warn_unused inline const eT& back() const;
inline void swap(Mat& B);
@@ -762,7 +762,7 @@ class Mat : public Base< eT, Mat<eT> >
inline void init_cold();
inline void init_warm(uword in_n_rows, uword in_n_cols);
inline arma_cold void init(const std::string& text);
arma_cold inline void init(const std::string& text);
inline void init(const std::initializer_list<eT>& list);
inline void init(const std::initializer_list< std::initializer_list<eT> >& list);
@@ -854,36 +854,36 @@ class Mat<eT>::fixed : public Mat<eT>
template<typename T1, typename T2, typename eglue_type> inline Mat& operator=(const eGlue<T1, T2, eglue_type>& X);
#endif
arma_inline arma_warn_unused const Op< Mat_fixed_type, op_htrans > t() const;
arma_inline arma_warn_unused const Op< Mat_fixed_type, op_htrans > ht() const;
arma_inline arma_warn_unused const Op< Mat_fixed_type, op_strans > st() const;
arma_warn_unused arma_inline const Op< Mat_fixed_type, op_htrans > t() const;
arma_warn_unused arma_inline const Op< Mat_fixed_type, op_htrans > ht() const;
arma_warn_unused arma_inline const Op< Mat_fixed_type, op_strans > st() const;
arma_inline arma_warn_unused const eT& at_alt (const uword i) const;
arma_warn_unused arma_inline const eT& at_alt (const uword i) const;
arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused const eT& operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i);
arma_inline arma_warn_unused const eT& at (const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused const eT& operator() (const uword i) const;
arma_warn_unused arma_inline eT& operator[] (const uword i);
arma_warn_unused arma_inline const eT& operator[] (const uword i) const;
arma_warn_unused arma_inline eT& at (const uword i);
arma_warn_unused arma_inline const eT& at (const uword i) const;
arma_warn_unused arma_inline eT& operator() (const uword i);
arma_warn_unused arma_inline const eT& operator() (const uword i) const;
#if defined(__cpp_multidimensional_subscript)
arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col) const;
#endif
arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused eT* colptr(const uword in_col);
arma_inline arma_warn_unused const eT* colptr(const uword in_col) const;
arma_warn_unused arma_inline eT* colptr(const uword in_col);
arma_warn_unused arma_inline const eT* colptr(const uword in_col) const;
arma_inline arma_warn_unused eT* memptr();
arma_inline arma_warn_unused const eT* memptr() const;
arma_warn_unused arma_inline eT* memptr();
arma_warn_unused arma_inline const eT* memptr() const;
arma_inline arma_warn_unused bool is_vec() const;
arma_warn_unused arma_inline bool is_vec() const;
inline const Mat<eT>& fill(const eT val);
inline const Mat<eT>& zeros();
include/armadillo_bits/Mat_meat.hpp
+4 -114
View File
@@ -457,7 +457,6 @@ Mat<eT>::init_warm(uword in_n_rows, uword in_n_cols)
//! create the matrix from a textual description
template<typename eT>
inline
arma_cold
Mat<eT>::Mat(const char* text)
: n_rows(0)
, n_cols(0)
@@ -477,7 +476,6 @@ Mat<eT>::Mat(const char* text)
//! create the matrix from a textual description
template<typename eT>
inline
arma_cold
Mat<eT>&
Mat<eT>::operator=(const char* text)
{
@@ -493,7 +491,6 @@ Mat<eT>::operator=(const char* text)
//! create the matrix from a textual description
template<typename eT>
inline
arma_cold
Mat<eT>::Mat(const std::string& text)
: n_rows(0)
, n_cols(0)
@@ -513,7 +510,6 @@ Mat<eT>::Mat(const std::string& text)
//! create the matrix from a textual description
template<typename eT>
inline
arma_cold
Mat<eT>&
Mat<eT>::operator=(const std::string& text)
{
@@ -529,7 +525,6 @@ Mat<eT>::operator=(const std::string& text)
//! internal function to create the matrix from a textual description
template<typename eT>
inline
arma_cold
void
Mat<eT>::init(const std::string& text_orig)
{
@@ -5992,7 +5987,6 @@ Mat<eT>::operator/=(const mtGlue<eT, T1, T2, glue_type>& X)
//! linear element accessor (treats the matrix as a vector); no bounds check; assumes memory is aligned
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::at_alt(const uword ii) const
{
@@ -6008,7 +6002,6 @@ Mat<eT>::at_alt(const uword ii) const
//! linear element accessor (treats the matrix as a vector); bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
eT&
Mat<eT>::operator() (const uword ii)
{
@@ -6022,7 +6015,6 @@ Mat<eT>::operator() (const uword ii)
//! linear element accessor (treats the matrix as a vector); bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::operator() (const uword ii) const
{
@@ -6035,7 +6027,6 @@ Mat<eT>::operator() (const uword ii) const
//! linear element accessor (treats the matrix as a vector); no bounds check.
template<typename eT>
arma_inline
arma_warn_unused
eT&
Mat<eT>::operator[] (const uword ii)
{
@@ -6047,7 +6038,6 @@ Mat<eT>::operator[] (const uword ii)
//! linear element accessor (treats the matrix as a vector); no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::operator[] (const uword ii) const
{
@@ -6059,7 +6049,6 @@ Mat<eT>::operator[] (const uword ii) const
//! linear element accessor (treats the matrix as a vector); no bounds check.
template<typename eT>
arma_inline
arma_warn_unused
eT&
Mat<eT>::at(const uword ii)
{
@@ -6071,7 +6060,6 @@ Mat<eT>::at(const uword ii)
//! linear element accessor (treats the matrix as a vector); no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::at(const uword ii) const
{
@@ -6083,7 +6071,6 @@ Mat<eT>::at(const uword ii) const
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
eT&
Mat<eT>::operator() (const uword in_row, const uword in_col)
{
@@ -6097,7 +6084,6 @@ Mat<eT>::operator() (const uword in_row, const uword in_col)
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::operator() (const uword in_row, const uword in_col) const
{
@@ -6111,7 +6097,6 @@ Mat<eT>::operator() (const uword in_row, const uword in_col) const
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
eT&
Mat<eT>::at(const uword in_row, const uword in_col)
{
@@ -6123,7 +6108,6 @@ Mat<eT>::at(const uword in_row, const uword in_col)
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Mat<eT>::at(const uword in_row, const uword in_col) const
{
@@ -6137,8 +6121,7 @@ Mat<eT>::at(const uword in_row, const uword in_col) const
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
eT&
eT&
Mat<eT>::operator[] (const uword in_row, const uword in_col)
{
return access::rw( mem[in_row + in_col*n_rows] );
@@ -6149,8 +6132,7 @@ Mat<eT>::at(const uword in_row, const uword in_col) const
//! element accessor; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT&
const eT&
Mat<eT>::operator[] (const uword in_row, const uword in_col) const
{
return mem[in_row + in_col*n_rows];
@@ -6211,7 +6193,6 @@ Mat<eT>::operator--(int)
//! returns true if the matrix has no elements
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::is_empty() const
{
@@ -6223,7 +6204,6 @@ Mat<eT>::is_empty() const
//! returns true if the object can be interpreted as a column or row vector
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::is_vec() const
{
@@ -6235,7 +6215,6 @@ Mat<eT>::is_vec() const
//! returns true if the object can be interpreted as a row vector
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::is_rowvec() const
{
@@ -6247,7 +6226,6 @@ Mat<eT>::is_rowvec() const
//! returns true if the object can be interpreted as a column vector
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::is_colvec() const
{
@@ -6259,7 +6237,6 @@ Mat<eT>::is_colvec() const
//! returns true if the object has the same number of non-zero rows and columnns
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::is_square() const
{
@@ -6271,7 +6248,6 @@ Mat<eT>::is_square() const
//! returns true if all of the elements are finite
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::is_finite() const
{
@@ -6282,7 +6258,6 @@ Mat<eT>::is_finite() const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::has_inf() const
{
@@ -6295,7 +6270,6 @@ Mat<eT>::has_inf() const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::has_nan() const
{
@@ -6308,7 +6282,6 @@ Mat<eT>::has_nan() const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::has_nonfinite() const
{
@@ -6321,7 +6294,6 @@ Mat<eT>::has_nonfinite() const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::is_sorted(const char* direction) const
{
@@ -6334,7 +6306,6 @@ Mat<eT>::is_sorted(const char* direction) const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::is_sorted(const char* direction, const uword dim) const
{
@@ -6410,7 +6381,6 @@ Mat<eT>::is_sorted(const char* direction, const uword dim) const
template<typename eT>
template<typename comparator>
inline
arma_warn_unused
bool
Mat<eT>::is_sorted_helper(const comparator& comp, const uword dim) const
{
@@ -6480,7 +6450,6 @@ Mat<eT>::is_sorted_helper(const comparator& comp, const uword dim) const
//! returns true if the given index is currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::in_range(const uword ii) const
{
@@ -6492,7 +6461,6 @@ Mat<eT>::in_range(const uword ii) const
//! returns true if the given start and end indices are currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::in_range(const span& x) const
{
@@ -6516,7 +6484,6 @@ Mat<eT>::in_range(const span& x) const
//! returns true if the given location is currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::in_range(const uword in_row, const uword in_col) const
{
@@ -6527,7 +6494,6 @@ Mat<eT>::in_range(const uword in_row, const uword in_col) const
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::in_range(const span& row_span, const uword in_col) const
{
@@ -6550,7 +6516,6 @@ Mat<eT>::in_range(const span& row_span, const uword in_col) const
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::in_range(const uword in_row, const span& col_span) const
{
@@ -6573,7 +6538,6 @@ Mat<eT>::in_range(const uword in_row, const span& col_span) const
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::in_range(const span& row_span, const span& col_span) const
{
@@ -6595,7 +6559,6 @@ Mat<eT>::in_range(const span& row_span, const span& col_span) const
template<typename eT>
arma_inline
arma_warn_unused
bool
Mat<eT>::in_range(const uword in_row, const uword in_col, const SizeMat& s) const
{
@@ -6617,7 +6580,6 @@ Mat<eT>::in_range(const uword in_row, const uword in_col, const SizeMat& s) cons
//! returns a pointer to array of eTs for a specified column; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
eT*
Mat<eT>::colptr(const uword in_col)
{
@@ -6629,7 +6591,6 @@ Mat<eT>::colptr(const uword in_col)
//! returns a pointer to array of eTs for a specified column; no bounds check
template<typename eT>
arma_inline
arma_warn_unused
const eT*
Mat<eT>::colptr(const uword in_col) const
{
@@ -6641,7 +6602,6 @@ Mat<eT>::colptr(const uword in_col) const
//! returns a pointer to array of eTs used by the matrix
template<typename eT>
arma_inline
arma_warn_unused
eT*
Mat<eT>::memptr()
{
@@ -6653,7 +6613,6 @@ Mat<eT>::memptr()
//! returns a pointer to array of eTs used by the matrix
template<typename eT>
arma_inline
arma_warn_unused
const eT*
Mat<eT>::memptr() const
{
@@ -7316,7 +7275,6 @@ Mat<eT>::eye(const SizeMat& s)
template<typename eT>
inline
arma_cold
void
Mat<eT>::reset()
{
@@ -7332,7 +7290,6 @@ Mat<eT>::reset()
template<typename eT>
inline
arma_cold
void
Mat<eT>::soft_reset()
{
@@ -7379,7 +7336,6 @@ Mat<eT>::set_imag(const Base<typename Mat<eT>::pod_type,T1>& X)
template<typename eT>
inline
arma_warn_unused
eT
Mat<eT>::min() const
{
@@ -7399,7 +7355,6 @@ Mat<eT>::min() const
template<typename eT>
inline
arma_warn_unused
eT
Mat<eT>::max() const
{
@@ -7520,7 +7475,6 @@ Mat<eT>::max(uword& row_of_max_val, uword& col_of_max_val) const
//! save the matrix to a file
template<typename eT>
inline
arma_cold
bool
Mat<eT>::save(const std::string name, const file_type type) const
{
@@ -7584,7 +7538,6 @@ Mat<eT>::save(const std::string name, const file_type type) const
template<typename eT>
inline
arma_cold
bool
Mat<eT>::save(const hdf5_name& spec, const file_type type) const
{
@@ -7644,7 +7597,6 @@ Mat<eT>::save(const hdf5_name& spec, const file_type type) const
template<typename eT>
inline
arma_cold
bool
Mat<eT>::save(const csv_name& spec, const file_type type) const
{
@@ -7721,7 +7673,6 @@ Mat<eT>::save(const csv_name& spec, const file_type type) const
//! save the matrix to a stream
template<typename eT>
inline
arma_cold
bool
Mat<eT>::save(std::ostream& os, const file_type type) const
{
@@ -7778,7 +7729,6 @@ Mat<eT>::save(std::ostream& os, const file_type type) const
//! load a matrix from a file
template<typename eT>
inline
arma_cold
bool
Mat<eT>::load(const std::string name, const file_type type)
{
@@ -7859,7 +7809,6 @@ Mat<eT>::load(const std::string name, const file_type type)
template<typename eT>
inline
arma_cold
bool
Mat<eT>::load(const hdf5_name& spec, const file_type type)
{
@@ -7911,7 +7860,6 @@ Mat<eT>::load(const hdf5_name& spec, const file_type type)
template<typename eT>
inline
arma_cold
bool
Mat<eT>::load(const csv_name& spec, const file_type type)
{
@@ -8000,7 +7948,6 @@ Mat<eT>::load(const csv_name& spec, const file_type type)
//! load a matrix from a stream
template<typename eT>
inline
arma_cold
bool
Mat<eT>::load(std::istream& is, const file_type type)
{
@@ -8207,7 +8154,6 @@ Mat<eT>::row_iterator::row_iterator(Mat<eT>& in_M, const uword in_row, const uwo
template<typename eT>
inline
arma_warn_unused
eT&
Mat<eT>::row_iterator::operator*()
{
@@ -8236,7 +8182,6 @@ Mat<eT>::row_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::row_iterator
Mat<eT>::row_iterator::operator++(int)
{
@@ -8274,7 +8219,6 @@ Mat<eT>::row_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::row_iterator
Mat<eT>::row_iterator::operator--(int)
{
@@ -8289,7 +8233,6 @@ Mat<eT>::row_iterator::operator--(int)
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_iterator::operator!=(const typename Mat<eT>::row_iterator& X) const
{
@@ -8300,7 +8243,6 @@ Mat<eT>::row_iterator::operator!=(const typename Mat<eT>::row_iterator& X) const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_iterator::operator==(const typename Mat<eT>::row_iterator& X) const
{
@@ -8311,7 +8253,6 @@ Mat<eT>::row_iterator::operator==(const typename Mat<eT>::row_iterator& X) const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_iterator::operator!=(const typename Mat<eT>::const_row_iterator& X) const
{
@@ -8322,7 +8263,6 @@ Mat<eT>::row_iterator::operator!=(const typename Mat<eT>::const_row_iterator& X)
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_iterator::operator==(const typename Mat<eT>::const_row_iterator& X) const
{
@@ -8383,7 +8323,6 @@ Mat<eT>::const_row_iterator::const_row_iterator(const Mat<eT>& in_M, const uword
template<typename eT>
inline
arma_warn_unused
const eT&
Mat<eT>::const_row_iterator::operator*() const
{
@@ -8412,7 +8351,6 @@ Mat<eT>::const_row_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::const_row_iterator
Mat<eT>::const_row_iterator::operator++(int)
{
@@ -8450,7 +8388,6 @@ Mat<eT>::const_row_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::const_row_iterator
Mat<eT>::const_row_iterator::operator--(int)
{
@@ -8465,7 +8402,6 @@ Mat<eT>::const_row_iterator::operator--(int)
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_iterator::operator!=(const typename Mat<eT>::row_iterator& X) const
{
@@ -8476,7 +8412,6 @@ Mat<eT>::const_row_iterator::operator!=(const typename Mat<eT>::row_iterator& X)
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_iterator::operator==(const typename Mat<eT>::row_iterator& X) const
{
@@ -8487,7 +8422,6 @@ Mat<eT>::const_row_iterator::operator==(const typename Mat<eT>::row_iterator& X)
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_iterator::operator!=(const typename Mat<eT>::const_row_iterator& X) const
{
@@ -8498,7 +8432,6 @@ Mat<eT>::const_row_iterator::operator!=(const typename Mat<eT>::const_row_iterat
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_iterator::operator==(const typename Mat<eT>::const_row_iterator& X) const
{
@@ -8549,7 +8482,6 @@ Mat<eT>::row_col_iterator::row_col_iterator(Mat<eT>& in_M, const uword in_row, c
template<typename eT>
inline
arma_warn_unused
eT&
Mat<eT>::row_col_iterator::operator*()
{
@@ -8583,7 +8515,6 @@ Mat<eT>::row_col_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::row_col_iterator
Mat<eT>::row_col_iterator::operator++(int)
{
@@ -8620,7 +8551,6 @@ Mat<eT>::row_col_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::row_col_iterator
Mat<eT>::row_col_iterator::operator--(int)
{
@@ -8635,7 +8565,6 @@ Mat<eT>::row_col_iterator::operator--(int)
template<typename eT>
inline
arma_warn_unused
uword
Mat<eT>::row_col_iterator::row() const
{
@@ -8646,7 +8575,6 @@ Mat<eT>::row_col_iterator::row() const
template<typename eT>
inline
arma_warn_unused
uword
Mat<eT>::row_col_iterator::col() const
{
@@ -8657,7 +8585,6 @@ Mat<eT>::row_col_iterator::col() const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_col_iterator::operator==(const row_col_iterator& rhs) const
{
@@ -8668,7 +8595,6 @@ Mat<eT>::row_col_iterator::operator==(const row_col_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_col_iterator::operator!=(const row_col_iterator& rhs) const
{
@@ -8679,7 +8605,6 @@ Mat<eT>::row_col_iterator::operator!=(const row_col_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_col_iterator::operator==(const const_row_col_iterator& rhs) const
{
@@ -8690,7 +8615,6 @@ Mat<eT>::row_col_iterator::operator==(const const_row_col_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::row_col_iterator::operator!=(const const_row_col_iterator& rhs) const
{
@@ -8754,7 +8678,6 @@ Mat<eT>::const_row_col_iterator::const_row_col_iterator(const Mat<eT>& in_M, con
template<typename eT>
inline
arma_warn_unused
const eT&
Mat<eT>::const_row_col_iterator::operator*() const
{
@@ -8788,7 +8711,6 @@ Mat<eT>::const_row_col_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::const_row_col_iterator
Mat<eT>::const_row_col_iterator::operator++(int)
{
@@ -8826,7 +8748,6 @@ Mat<eT>::const_row_col_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename Mat<eT>::const_row_col_iterator
Mat<eT>::const_row_col_iterator::operator--(int)
{
@@ -8841,7 +8762,6 @@ Mat<eT>::const_row_col_iterator::operator--(int)
template<typename eT>
inline
arma_warn_unused
uword
Mat<eT>::const_row_col_iterator::row() const
{
@@ -8852,7 +8772,6 @@ Mat<eT>::const_row_col_iterator::row() const
template<typename eT>
inline
arma_warn_unused
uword
Mat<eT>::const_row_col_iterator::col() const
{
@@ -8863,7 +8782,6 @@ Mat<eT>::const_row_col_iterator::col() const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_col_iterator::operator==(const const_row_col_iterator& rhs) const
{
@@ -8874,7 +8792,6 @@ Mat<eT>::const_row_col_iterator::operator==(const const_row_col_iterator& rhs) c
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_col_iterator::operator!=(const const_row_col_iterator& rhs) const
{
@@ -8885,7 +8802,6 @@ Mat<eT>::const_row_col_iterator::operator!=(const const_row_col_iterator& rhs) c
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_col_iterator::operator==(const row_col_iterator& rhs) const
{
@@ -8896,7 +8812,6 @@ Mat<eT>::const_row_col_iterator::operator==(const row_col_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
Mat<eT>::const_row_col_iterator::operator!=(const row_col_iterator& rhs) const
{
@@ -9162,7 +9077,6 @@ Mat<eT>::size() const
template<typename eT>
inline
arma_warn_unused
eT&
Mat<eT>::front()
{
@@ -9175,7 +9089,6 @@ Mat<eT>::front()
template<typename eT>
inline
arma_warn_unused
const eT&
Mat<eT>::front() const
{
@@ -9188,7 +9101,6 @@ Mat<eT>::front() const
template<typename eT>
inline
arma_warn_unused
eT&
Mat<eT>::back()
{
@@ -9201,7 +9113,6 @@ Mat<eT>::back()
template<typename eT>
inline
arma_warn_unused
const eT&
Mat<eT>::back() const
{
@@ -9512,7 +9423,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator=(const fixed<fixed_n_rows,
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
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
{
@@ -9524,7 +9434,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::t() const
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
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
{
@@ -9536,7 +9445,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::ht() const
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
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
{
@@ -9548,7 +9456,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::st() const
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>::at_alt(const uword ii) const
{
@@ -9570,7 +9477,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::at_alt(const uword ii) const
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 ii)
{
@@ -9582,7 +9488,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator[] (const uword ii)
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 ii) const
{
@@ -9594,7 +9499,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator[] (const uword ii) const
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>::at(const uword ii)
{
@@ -9606,7 +9510,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::at(const uword ii)
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>::at(const uword ii) const
{
@@ -9618,7 +9521,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::at(const uword ii) const
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 ii)
{
@@ -9632,7 +9534,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword ii)
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 ii) const
{
@@ -9648,8 +9549,7 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword ii) const
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
eT&
eT&
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator[] (const uword in_row, const uword in_col)
{
const uword iq = in_row + in_col*fixed_n_rows;
@@ -9662,8 +9562,7 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword ii) const
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
const eT&
const eT&
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator[] (const uword in_row, const uword in_col) const
{
const uword iq = in_row + in_col*fixed_n_rows;
@@ -9678,7 +9577,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword ii) const
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>::at(const uword in_row, const uword in_col)
{
@@ -9692,7 +9590,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::at(const uword in_row, const uword i
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>::at(const uword in_row, const uword in_col) const
{
@@ -9706,7 +9603,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::at(const uword in_row, const uword i
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, const uword in_col)
{
@@ -9722,7 +9618,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword in_row, cons
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, const uword in_col) const
{
@@ -9738,7 +9633,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator() (const uword in_row, cons
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>::colptr(const uword in_col)
{
@@ -9752,7 +9646,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::colptr(const uword in_col)
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>::colptr(const uword in_col) const
{
@@ -9766,7 +9659,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::colptr(const uword in_col) const
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>::memptr()
{
@@ -9778,7 +9670,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::memptr()
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>::memptr() const
{
@@ -9790,7 +9681,6 @@ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::memptr() const
template<typename eT>
template<uword fixed_n_rows, uword fixed_n_cols>
arma_inline
arma_warn_unused
bool
Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::is_vec() const
{
include/armadillo_bits/Row_bones.hpp
+24 -24
View File
@@ -90,11 +90,11 @@ class Row : public Mat<eT>
arma_frown("use braced initialiser list instead") inline mat_injector<Row> operator<<(const eT val);
arma_inline arma_warn_unused const Op<Row<eT>,op_htrans> t() const;
arma_inline arma_warn_unused const Op<Row<eT>,op_htrans> ht() const;
arma_inline arma_warn_unused const Op<Row<eT>,op_strans> st() const;
arma_warn_unused arma_inline const Op<Row<eT>,op_htrans> t() const;
arma_warn_unused arma_inline const Op<Row<eT>,op_htrans> ht() const;
arma_warn_unused arma_inline const Op<Row<eT>,op_strans> st() const;
arma_inline arma_warn_unused const Op<Row<eT>,op_strans> as_col() const;
arma_warn_unused arma_inline const Op<Row<eT>,op_strans> as_col() const;
arma_inline subview_row<eT> col(const uword col_num);
arma_inline const subview_row<eT> col(const uword col_num) const;
@@ -144,11 +144,11 @@ class Row : public Mat<eT>
template<typename T1> inline void insert_cols(const uword col_num, const Base<eT,T1>& X);
arma_inline arma_warn_unused eT& at(const uword i);
arma_inline arma_warn_unused const eT& at(const uword i) const;
arma_warn_unused arma_inline eT& at(const uword i);
arma_warn_unused arma_inline const eT& at(const uword i) const;
arma_inline arma_warn_unused eT& at(const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& at(const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& at(const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& at(const uword in_row, const uword in_col) const;
typedef eT* row_iterator;
@@ -237,26 +237,26 @@ class Row<eT>::fixed : public Row<eT>
template<typename T1, typename T2, typename eglue_type> inline Row& operator=(const eGlue<T1, T2, eglue_type>& X);
#endif
arma_inline arma_warn_unused const Op< Row_fixed_type, op_htrans > t() const;
arma_inline arma_warn_unused const Op< Row_fixed_type, op_htrans > ht() const;
arma_inline arma_warn_unused const Op< Row_fixed_type, op_strans > st() const;
arma_warn_unused arma_inline const Op< Row_fixed_type, op_htrans > t() const;
arma_warn_unused arma_inline const Op< Row_fixed_type, op_htrans > ht() const;
arma_warn_unused arma_inline const Op< Row_fixed_type, op_strans > st() const;
arma_inline arma_warn_unused const eT& at_alt (const uword i) const;
arma_warn_unused arma_inline const eT& at_alt (const uword i) const;
arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused const eT& operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i);
arma_inline arma_warn_unused const eT& at (const uword i) const;
arma_inline arma_warn_unused eT& operator() (const uword i);
arma_inline arma_warn_unused const eT& operator() (const uword i) const;
arma_warn_unused arma_inline eT& operator[] (const uword i);
arma_warn_unused arma_inline const eT& operator[] (const uword i) const;
arma_warn_unused arma_inline eT& at (const uword i);
arma_warn_unused arma_inline const eT& at (const uword i) const;
arma_warn_unused arma_inline eT& operator() (const uword i);
arma_warn_unused arma_inline const eT& operator() (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col);
arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col);
arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused eT* memptr();
arma_inline arma_warn_unused const eT* memptr() const;
arma_warn_unused arma_inline eT* memptr();
arma_warn_unused arma_inline const eT* memptr() const;
arma_hot inline const Row<eT>& fill(const eT val);
arma_hot inline const Row<eT>& zeros();
include/armadillo_bits/Row_meat.hpp
-27
View File
@@ -621,7 +621,6 @@ Row<eT>::operator<<(const eT val)
template<typename eT>
arma_inline
arma_warn_unused
const Op<Row<eT>,op_htrans>
Row<eT>::t() const
{
@@ -632,7 +631,6 @@ Row<eT>::t() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<Row<eT>,op_htrans>
Row<eT>::ht() const
{
@@ -643,7 +641,6 @@ Row<eT>::ht() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<Row<eT>,op_strans>
Row<eT>::st() const
{
@@ -654,7 +651,6 @@ Row<eT>::st() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<Row<eT>,op_strans>
Row<eT>::as_col() const
{
@@ -1123,7 +1119,6 @@ Row<eT>::insert_cols(const uword col_num, const Base<eT,T1>& X)
template<typename eT>
arma_inline
arma_warn_unused
eT&
Row<eT>::at(const uword i)
{
@@ -1134,7 +1129,6 @@ Row<eT>::at(const uword i)
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Row<eT>::at(const uword i) const
{
@@ -1145,7 +1139,6 @@ Row<eT>::at(const uword i) const
template<typename eT>
arma_inline
arma_warn_unused
eT&
Row<eT>::at(const uword, const uword in_col)
{
@@ -1156,7 +1149,6 @@ Row<eT>::at(const uword, const uword in_col)
template<typename eT>
arma_inline
arma_warn_unused
const eT&
Row<eT>::at(const uword, const uword in_col) const
{
@@ -1577,7 +1569,6 @@ Row<eT>::fixed<fixed_n_elem>::operator=(const fixed<fixed_n_elem>& X)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type, op_htrans >
Row<eT>::fixed<fixed_n_elem>::t() const
{
@@ -1589,7 +1580,6 @@ Row<eT>::fixed<fixed_n_elem>::t() const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type, op_htrans >
Row<eT>::fixed<fixed_n_elem>::ht() const
{
@@ -1601,7 +1591,6 @@ Row<eT>::fixed<fixed_n_elem>::ht() const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const Op< typename Row<eT>::template fixed<fixed_n_elem>::Row_fixed_type, op_strans >
Row<eT>::fixed<fixed_n_elem>::st() const
{
@@ -1613,7 +1602,6 @@ Row<eT>::fixed<fixed_n_elem>::st() const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Row<eT>::fixed<fixed_n_elem>::at_alt(const uword ii) const
{
@@ -1635,7 +1623,6 @@ Row<eT>::fixed<fixed_n_elem>::at_alt(const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Row<eT>::fixed<fixed_n_elem>::operator[] (const uword ii)
{
@@ -1647,7 +1634,6 @@ Row<eT>::fixed<fixed_n_elem>::operator[] (const uword ii)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Row<eT>::fixed<fixed_n_elem>::operator[] (const uword ii) const
{
@@ -1659,7 +1645,6 @@ Row<eT>::fixed<fixed_n_elem>::operator[] (const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Row<eT>::fixed<fixed_n_elem>::at(const uword ii)
{
@@ -1671,7 +1656,6 @@ Row<eT>::fixed<fixed_n_elem>::at(const uword ii)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Row<eT>::fixed<fixed_n_elem>::at(const uword ii) const
{
@@ -1683,7 +1667,6 @@ Row<eT>::fixed<fixed_n_elem>::at(const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Row<eT>::fixed<fixed_n_elem>::operator() (const uword ii)
{
@@ -1697,7 +1680,6 @@ Row<eT>::fixed<fixed_n_elem>::operator() (const uword ii)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Row<eT>::fixed<fixed_n_elem>::operator() (const uword ii) const
{
@@ -1711,7 +1693,6 @@ Row<eT>::fixed<fixed_n_elem>::operator() (const uword ii) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Row<eT>::fixed<fixed_n_elem>::at(const uword, const uword in_col)
{
@@ -1723,7 +1704,6 @@ Row<eT>::fixed<fixed_n_elem>::at(const uword, const uword in_col)
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Row<eT>::fixed<fixed_n_elem>::at(const uword, const uword in_col) const
{
@@ -1735,7 +1715,6 @@ Row<eT>::fixed<fixed_n_elem>::at(const uword, const uword in_col) const
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT&
Row<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col)
{
@@ -1749,7 +1728,6 @@ Row<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT&
Row<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col) const
{
@@ -1763,7 +1741,6 @@ Row<eT>::fixed<fixed_n_elem>::operator() (const uword in_row, const uword in_col
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
eT*
Row<eT>::fixed<fixed_n_elem>::memptr()
{
@@ -1775,7 +1752,6 @@ Row<eT>::fixed<fixed_n_elem>::memptr()
template<typename eT>
template<uword fixed_n_elem>
arma_inline
arma_warn_unused
const eT*
Row<eT>::fixed<fixed_n_elem>::memptr() const
{
@@ -1786,7 +1762,6 @@ Row<eT>::fixed<fixed_n_elem>::memptr() const
template<typename eT>
template<uword fixed_n_elem>
arma_hot
inline
const Row<eT>&
Row<eT>::fixed<fixed_n_elem>::fill(const eT val)
@@ -1804,7 +1779,6 @@ Row<eT>::fixed<fixed_n_elem>::fill(const eT val)
template<typename eT>
template<uword fixed_n_elem>
arma_hot
inline
const Row<eT>&
Row<eT>::fixed<fixed_n_elem>::zeros()
@@ -1822,7 +1796,6 @@ Row<eT>::fixed<fixed_n_elem>::zeros()
template<typename eT>
template<uword fixed_n_elem>
arma_hot
inline
const Row<eT>&
Row<eT>::fixed<fixed_n_elem>::ones()
include/armadillo_bits/SpBase_bones.hpp
+27 -27
View File
@@ -24,14 +24,14 @@
template<typename elem_type, typename derived>
struct SpBase_eval_SpMat
{
inline arma_warn_unused const derived& eval() const;
arma_warn_unused inline const derived& eval() const;
};
template<typename elem_type, typename derived>
struct SpBase_eval_expr
{
inline arma_warn_unused SpMat<elem_type> eval() const; //!< force the immediate evaluation of a delayed expression
arma_warn_unused inline SpMat<elem_type> eval() const; //!< force the immediate evaluation of a delayed expression
};
@@ -54,9 +54,9 @@ struct SpBase
arma_inline bool is_alias(const SpMat<elem_type>& X) const;
inline arma_warn_unused const SpOp<derived,spop_htrans> t() const; //!< Hermitian transpose
inline arma_warn_unused const SpOp<derived,spop_htrans> ht() const; //!< Hermitian transpose
inline arma_warn_unused const SpOp<derived,spop_strans> st() const; //!< simple transpose
arma_warn_unused inline const SpOp<derived,spop_htrans> t() const; //!< Hermitian transpose
arma_warn_unused inline const SpOp<derived,spop_htrans> ht() const; //!< Hermitian transpose
arma_warn_unused inline const SpOp<derived,spop_strans> st() const; //!< simple transpose
arma_cold inline void print( const std::string extra_text = "") const;
arma_cold inline void print(std::ostream& user_stream, const std::string extra_text = "") const;
@@ -73,8 +73,8 @@ struct SpBase
arma_cold inline void brief_print( const std::string extra_text = "") const;
arma_cold inline void brief_print(std::ostream& user_stream, const std::string extra_text = "") const;
inline arma_warn_unused elem_type min() const;
inline arma_warn_unused elem_type max() const;
arma_warn_unused inline elem_type min() const;
arma_warn_unused inline elem_type max() const;
inline elem_type min(uword& index_of_min_val) const;
inline elem_type max(uword& index_of_max_val) const;
@@ -82,31 +82,31 @@ struct SpBase
inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
inline arma_warn_unused uword index_min() const;
inline arma_warn_unused uword index_max() const;
arma_warn_unused inline uword index_min() const;
arma_warn_unused inline uword index_max() const;
inline arma_warn_unused bool is_symmetric() const;
inline arma_warn_unused bool is_symmetric(const typename get_pod_type<elem_type>::result tol) const;
arma_warn_unused inline bool is_symmetric() const;
arma_warn_unused inline bool is_symmetric(const typename get_pod_type<elem_type>::result tol) const;
inline arma_warn_unused bool is_hermitian() const;
inline arma_warn_unused bool is_hermitian(const typename get_pod_type<elem_type>::result tol) const;
arma_warn_unused inline bool is_hermitian() const;
arma_warn_unused inline bool is_hermitian(const typename get_pod_type<elem_type>::result tol) const;
inline arma_warn_unused bool is_zero(const typename get_pod_type<elem_type>::result tol = 0) const;
arma_warn_unused inline bool is_zero(const typename get_pod_type<elem_type>::result tol = 0) const;
inline arma_warn_unused bool is_trimatu() const;
inline arma_warn_unused bool is_trimatl() const;
inline arma_warn_unused bool is_diagmat() const;
inline arma_warn_unused bool is_empty() const;
inline arma_warn_unused bool is_square() const;
inline arma_warn_unused bool is_vec() const;
inline arma_warn_unused bool is_colvec() const;
inline arma_warn_unused bool is_rowvec() const;
inline arma_warn_unused bool is_finite() const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
arma_warn_unused inline bool is_trimatu() const;
arma_warn_unused inline bool is_trimatl() const;
arma_warn_unused inline bool is_diagmat() const;
arma_warn_unused inline bool is_empty() const;
arma_warn_unused inline bool is_square() const;
arma_warn_unused inline bool is_vec() const;
arma_warn_unused inline bool is_colvec() const;
arma_warn_unused inline bool is_rowvec() const;
arma_warn_unused inline bool is_finite() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
inline arma_warn_unused const SpOp<derived,spop_vectorise_col> as_col() const;
inline arma_warn_unused const SpOp<derived,spop_vectorise_row> as_row() const;
arma_warn_unused inline const SpOp<derived,spop_vectorise_col> as_col() const;
arma_warn_unused inline const SpOp<derived,spop_vectorise_row> as_row() const;
};
include/armadillo_bits/SpBase_meat.hpp
-37
View File
@@ -43,7 +43,6 @@ SpBase<elem_type,derived>::is_alias(const SpMat<elem_type>& X) const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const SpOp<derived, spop_htrans>
SpBase<elem_type,derived>::t() const
{
@@ -53,7 +52,6 @@ SpBase<elem_type,derived>::t() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const SpOp<derived, spop_htrans>
SpBase<elem_type,derived>::ht() const
{
@@ -64,7 +62,6 @@ SpBase<elem_type,derived>::ht() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const SpOp<derived, spop_strans>
SpBase<elem_type,derived>::st() const
{
@@ -74,7 +71,6 @@ SpBase<elem_type,derived>::st() const
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type,derived>::print(const std::string extra_text) const
@@ -98,7 +94,6 @@ SpBase<elem_type,derived>::print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type,derived>::print(std::ostream& user_stream, const std::string extra_text) const
@@ -122,7 +117,6 @@ SpBase<elem_type,derived>::print(std::ostream& user_stream, const std::string ex
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type,derived>::raw_print(const std::string extra_text) const
@@ -146,7 +140,6 @@ SpBase<elem_type,derived>::raw_print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type,derived>::raw_print(std::ostream& user_stream, const std::string extra_text) const
@@ -170,7 +163,6 @@ SpBase<elem_type,derived>::raw_print(std::ostream& user_stream, const std::strin
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type, derived>::print_dense(const std::string extra_text) const
@@ -194,7 +186,6 @@ SpBase<elem_type, derived>::print_dense(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type, derived>::print_dense(std::ostream& user_stream, const std::string extra_text) const
@@ -218,7 +209,6 @@ SpBase<elem_type, derived>::print_dense(std::ostream& user_stream, const std::st
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type, derived>::raw_print_dense(const std::string extra_text) const
@@ -242,7 +232,6 @@ SpBase<elem_type, derived>::raw_print_dense(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type, derived>::raw_print_dense(std::ostream& user_stream, const std::string extra_text) const
@@ -266,7 +255,6 @@ SpBase<elem_type, derived>::raw_print_dense(std::ostream& user_stream, const std
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type,derived>::brief_print(const std::string extra_text) const
@@ -290,7 +278,6 @@ SpBase<elem_type,derived>::brief_print(const std::string extra_text) const
template<typename elem_type, typename derived>
arma_cold
inline
void
SpBase<elem_type,derived>::brief_print(std::ostream& user_stream, const std::string extra_text) const
@@ -318,7 +305,6 @@ SpBase<elem_type,derived>::brief_print(std::ostream& user_stream, const std::str
template<typename elem_type, typename derived>
inline
arma_warn_unused
const derived&
SpBase_eval_SpMat<elem_type, derived>::eval() const
{
@@ -334,7 +320,6 @@ SpBase_eval_SpMat<elem_type, derived>::eval() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
SpMat<elem_type>
SpBase_eval_expr<elem_type, derived>::eval() const
{
@@ -347,7 +332,6 @@ SpBase_eval_expr<elem_type, derived>::eval() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
elem_type
SpBase<elem_type, derived>::min() const
{
@@ -358,7 +342,6 @@ SpBase<elem_type, derived>::min() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
elem_type
SpBase<elem_type, derived>::max() const
{
@@ -435,7 +418,6 @@ SpBase<elem_type, derived>::max(uword& row_of_max_val, uword& col_of_max_val) co
template<typename elem_type, typename derived>
inline
arma_warn_unused
uword
SpBase<elem_type,derived>::index_min() const
{
@@ -459,7 +441,6 @@ SpBase<elem_type,derived>::index_min() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
uword
SpBase<elem_type,derived>::index_max() const
{
@@ -483,7 +464,6 @@ SpBase<elem_type,derived>::index_max() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_symmetric() const
{
@@ -498,7 +478,6 @@ SpBase<elem_type,derived>::is_symmetric() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_symmetric(const typename get_pod_type<elem_type>::result tol) const
{
@@ -513,7 +492,6 @@ SpBase<elem_type,derived>::is_symmetric(const typename get_pod_type<elem_type>::
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_hermitian() const
{
@@ -528,7 +506,6 @@ SpBase<elem_type,derived>::is_hermitian() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_hermitian(const typename get_pod_type<elem_type>::result tol) const
{
@@ -543,7 +520,6 @@ SpBase<elem_type,derived>::is_hermitian(const typename get_pod_type<elem_type>::
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::result tol) const
{
@@ -601,7 +577,6 @@ SpBase<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::resul
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_trimatu() const
{
@@ -627,7 +602,6 @@ SpBase<elem_type,derived>::is_trimatu() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_trimatl() const
{
@@ -653,7 +627,6 @@ SpBase<elem_type,derived>::is_trimatl() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_diagmat() const
{
@@ -677,7 +650,6 @@ SpBase<elem_type,derived>::is_diagmat() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_empty() const
{
@@ -692,7 +664,6 @@ SpBase<elem_type,derived>::is_empty() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_square() const
{
@@ -707,7 +678,6 @@ SpBase<elem_type,derived>::is_square() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_vec() const
{
@@ -724,7 +694,6 @@ SpBase<elem_type,derived>::is_vec() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_colvec() const
{
@@ -741,7 +710,6 @@ SpBase<elem_type,derived>::is_colvec() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_rowvec() const
{
@@ -758,7 +726,6 @@ SpBase<elem_type,derived>::is_rowvec() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::is_finite() const
{
@@ -791,7 +758,6 @@ SpBase<elem_type,derived>::is_finite() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::has_inf() const
{
@@ -824,7 +790,6 @@ SpBase<elem_type,derived>::has_inf() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
bool
SpBase<elem_type,derived>::has_nan() const
{
@@ -857,7 +822,6 @@ SpBase<elem_type,derived>::has_nan() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const SpOp<derived,spop_vectorise_col>
SpBase<elem_type, derived>::as_col() const
{
@@ -868,7 +832,6 @@ SpBase<elem_type, derived>::as_col() const
template<typename elem_type, typename derived>
inline
arma_warn_unused
const SpOp<derived,spop_vectorise_row>
SpBase<elem_type, derived>::as_row() const
{
include/armadillo_bits/SpCol_bones.hpp
+3 -3
View File
@@ -56,9 +56,9 @@ class SpCol : public SpMat<eT>
template<typename T1, typename T2>
inline explicit SpCol(const SpBase<pod_type,T1>& A, const SpBase<pod_type,T2>& B);
inline arma_warn_unused const SpOp<SpCol<eT>,spop_htrans> t() const;
inline arma_warn_unused const SpOp<SpCol<eT>,spop_htrans> ht() const;
inline arma_warn_unused const SpOp<SpCol<eT>,spop_strans> st() const;
arma_warn_unused inline const SpOp<SpCol<eT>,spop_htrans> t() const;
arma_warn_unused inline const SpOp<SpCol<eT>,spop_htrans> ht() const;
arma_warn_unused inline const SpOp<SpCol<eT>,spop_strans> st() const;
inline void shed_row (const uword row_num);
inline void shed_rows(const uword in_row1, const uword in_row2);
include/armadillo_bits/SpCol_meat.hpp
-3
View File
@@ -204,7 +204,6 @@ SpCol<eT>::SpCol
template<typename eT>
inline
arma_warn_unused
const SpOp<SpCol<eT>,spop_htrans>
SpCol<eT>::t() const
{
@@ -215,7 +214,6 @@ SpCol<eT>::t() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpCol<eT>,spop_htrans>
SpCol<eT>::ht() const
{
@@ -226,7 +224,6 @@ SpCol<eT>::ht() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpCol<eT>,spop_strans>
SpCol<eT>::st() const
{
include/armadillo_bits/SpMat_bones.hpp
+90 -90
View File
@@ -274,54 +274,54 @@ class SpMat : public SpBase< eT, SpMat<eT> >
// access the i-th element; if there is nothing at element i, 0 is returned
arma_inline arma_warn_unused SpMat_MapMat_val<eT> operator[] (const uword i);
arma_inline arma_warn_unused eT operator[] (const uword i) const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> operator[] (const uword i);
arma_warn_unused arma_inline eT operator[] (const uword i) const;
arma_inline arma_warn_unused SpMat_MapMat_val<eT> at (const uword i);
arma_inline arma_warn_unused eT at (const uword i) const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> at (const uword i);
arma_warn_unused arma_inline eT at (const uword i) const;
arma_inline arma_warn_unused SpMat_MapMat_val<eT> operator() (const uword i);
arma_inline arma_warn_unused eT operator() (const uword i) const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> operator() (const uword i);
arma_warn_unused arma_inline eT operator() (const uword i) const;
// access the element at the given row and column; if there is nothing at that position, 0 is returned
#if defined(__cpp_multidimensional_subscript)
arma_inline arma_warn_unused SpMat_MapMat_val<eT> operator[] (const uword in_row, const uword in_col);
arma_inline arma_warn_unused eT operator[] (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> operator[] (const uword in_row, const uword in_col);
arma_warn_unused arma_inline eT operator[] (const uword in_row, const uword in_col) const;
#endif
arma_inline arma_warn_unused SpMat_MapMat_val<eT> at (const uword in_row, const uword in_col);
arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> at (const uword in_row, const uword in_col);
arma_warn_unused arma_inline eT at (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused SpMat_MapMat_val<eT> operator() (const uword in_row, const uword in_col);
arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> operator() (const uword in_row, const uword in_col);
arma_warn_unused arma_inline eT operator() (const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused bool is_empty() const;
arma_inline arma_warn_unused bool is_vec() const;
arma_inline arma_warn_unused bool is_rowvec() const;
arma_inline arma_warn_unused bool is_colvec() const;
arma_inline arma_warn_unused bool is_square() const;
inline arma_warn_unused bool is_finite() const;
arma_warn_unused arma_inline bool is_empty() const;
arma_warn_unused arma_inline bool is_vec() const;
arma_warn_unused arma_inline bool is_rowvec() const;
arma_warn_unused arma_inline bool is_colvec() const;
arma_warn_unused arma_inline bool is_square() const;
arma_warn_unused inline bool is_finite() const;
inline arma_warn_unused bool is_symmetric() const;
inline arma_warn_unused bool is_symmetric(const typename get_pod_type<eT>::result tol) const;
arma_warn_unused inline bool is_symmetric() const;
arma_warn_unused inline bool is_symmetric(const typename get_pod_type<eT>::result tol) const;
inline arma_warn_unused bool is_hermitian() const;
inline arma_warn_unused bool is_hermitian(const typename get_pod_type<eT>::result tol) const;
arma_warn_unused inline bool is_hermitian() const;
arma_warn_unused inline bool is_hermitian(const typename get_pod_type<eT>::result tol) const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
inline arma_warn_unused bool has_nonfinite() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
arma_warn_unused inline bool has_nonfinite() const;
arma_inline arma_warn_unused bool in_range(const uword i) const;
arma_inline arma_warn_unused bool in_range(const span& x) const;
arma_warn_unused arma_inline bool in_range(const uword i) const;
arma_warn_unused arma_inline bool in_range(const span& x) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused bool in_range(const span& row_span, const uword in_col) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const span& col_span) const;
arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline bool in_range(const span& row_span, const uword in_col) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const span& col_span) const;
arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const;
template<typename eT2> inline void copy_size(const SpMat<eT2>& m);
@@ -390,13 +390,13 @@ class SpMat : public SpBase< eT, SpMat<eT> >
// saving and loading
// TODO: implement auto_detect for sparse matrices
inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const;
inline arma_cold bool save(const csv_name& spec, const file_type type = csv_ascii) const;
inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) const;
arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const;
arma_cold inline bool save(const csv_name& spec, const file_type type = csv_ascii) const;
arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const;
inline arma_cold bool load(const std::string name, const file_type type = arma_binary);
inline arma_cold bool load(const csv_name& spec, const file_type type = csv_ascii);
inline arma_cold bool load( std::istream& is, const file_type type = arma_binary);
arma_cold inline bool load(const std::string name, const file_type type = arma_binary);
arma_cold inline bool load(const csv_name& spec, const file_type type = csv_ascii);
arma_cold inline bool load( std::istream& is, const file_type type = arma_binary);
arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const;
arma_deprecated inline bool quiet_save( std::ostream& os, const file_type type = arma_binary) const;
@@ -453,23 +453,23 @@ class SpMat : public SpBase< eT, SpMat<eT> >
inline const_iterator(const const_iterator& other);
inline const_iterator& operator= (const const_iterator& other) = default;
inline arma_hot const_iterator& operator++();
inline arma_warn_unused const_iterator operator++(int);
arma_hot inline const_iterator& operator++();
arma_warn_unused inline const_iterator operator++(int);
inline arma_hot const_iterator& operator--();
inline arma_warn_unused const_iterator operator--(int);
arma_hot inline const_iterator& operator--();
arma_warn_unused inline const_iterator operator--(int);
inline arma_hot bool operator==(const const_iterator& rhs) const;
inline arma_hot bool operator!=(const const_iterator& rhs) const;
arma_hot inline bool operator==(const const_iterator& rhs) const;
arma_hot inline bool operator!=(const const_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpSubview<eT>::const_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpSubview<eT>::const_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpSubview<eT>::const_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpSubview<eT>::const_iterator& rhs) const;
inline arma_hot bool operator==(const const_row_iterator& rhs) const;
inline arma_hot bool operator!=(const const_row_iterator& rhs) const;
arma_hot inline bool operator==(const const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const const_row_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpSubview<eT>::const_row_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpSubview<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpSubview<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpSubview<eT>::const_row_iterator& rhs) const;
};
/**
@@ -490,14 +490,14 @@ class SpMat : public SpBase< eT, SpMat<eT> >
inline iterator (const iterator& other) : const_iterator(other) { }
inline iterator& operator=(const iterator& other) = default;
inline arma_hot SpValProxy< SpMat<eT> > operator*();
arma_hot inline SpValProxy< SpMat<eT> > operator*();
// overloads needed for return type correctness
inline arma_hot iterator& operator++();
inline arma_warn_unused iterator operator++(int);
arma_hot inline iterator& operator++();
arma_warn_unused inline iterator operator++(int);
inline arma_hot iterator& operator--();
inline arma_warn_unused iterator operator--(int);
arma_hot inline iterator& operator--();
arma_warn_unused inline iterator operator--(int);
// this has a different value_type than iterator_base
typedef SpValProxy< SpMat<eT> > value_type;
@@ -516,11 +516,11 @@ class SpMat : public SpBase< eT, SpMat<eT> >
inline const_row_iterator(const const_row_iterator& other);
inline const_row_iterator& operator= (const const_row_iterator& other) = default;
inline arma_hot const_row_iterator& operator++();
inline arma_warn_unused const_row_iterator operator++(int);
arma_hot inline const_row_iterator& operator++();
arma_warn_unused inline const_row_iterator operator++(int);
inline arma_hot const_row_iterator& operator--();
inline arma_warn_unused const_row_iterator operator--(int);
arma_hot inline const_row_iterator& operator--();
arma_warn_unused inline const_row_iterator operator--(int);
uword internal_row; // hold row internally
uword actual_pos; // hold the true position we are at in the matrix, as column-major indexing
@@ -529,17 +529,17 @@ class SpMat : public SpBase< eT, SpMat<eT> >
arma_inline uword row() const { return internal_row; }
inline arma_hot bool operator==(const const_iterator& rhs) const;
inline arma_hot bool operator!=(const const_iterator& rhs) const;
arma_hot inline bool operator==(const const_iterator& rhs) const;
arma_hot inline bool operator!=(const const_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpSubview<eT>::const_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpSubview<eT>::const_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpSubview<eT>::const_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpSubview<eT>::const_iterator& rhs) const;
inline arma_hot bool operator==(const const_row_iterator& rhs) const;
inline arma_hot bool operator!=(const const_row_iterator& rhs) const;
arma_hot inline bool operator==(const const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const const_row_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpSubview<eT>::const_row_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpSubview<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpSubview<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpSubview<eT>::const_row_iterator& rhs) const;
};
class row_iterator : public const_row_iterator
@@ -554,14 +554,14 @@ class SpMat : public SpBase< eT, SpMat<eT> >
inline row_iterator(const row_iterator& other) : const_row_iterator(other) { }
inline row_iterator& operator= (const row_iterator& other) = default;
inline arma_hot SpValProxy< SpMat<eT> > operator*();
arma_hot inline SpValProxy< SpMat<eT> > operator*();
// overloads required for return type correctness
inline arma_hot row_iterator& operator++();
inline arma_warn_unused row_iterator operator++(int);
arma_hot inline row_iterator& operator++();
arma_warn_unused inline row_iterator operator++(int);
inline arma_hot row_iterator& operator--();
inline arma_warn_unused row_iterator operator--(int);
arma_hot inline row_iterator& operator--();
arma_warn_unused inline row_iterator operator--(int);
// this has a different value_type than iterator_base
typedef SpValProxy< SpMat<eT> > value_type;
@@ -617,11 +617,11 @@ class SpMat : public SpBase< eT, SpMat<eT> >
inline bool empty() const;
inline uword size() const;
arma_inline arma_warn_unused SpMat_MapMat_val<eT> front();
arma_inline arma_warn_unused eT front() const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> front();
arma_warn_unused arma_inline eT front() const;
arma_inline arma_warn_unused SpMat_MapMat_val<eT> back();
arma_inline arma_warn_unused eT back() const;
arma_warn_unused arma_inline SpMat_MapMat_val<eT> back();
arma_warn_unused arma_inline eT back() const;
// Resize memory.
// If the new size is larger, the column pointers and new memory still need to be correctly set.
@@ -651,8 +651,8 @@ class SpMat : public SpBase< eT, SpMat<eT> >
protected:
inline void init(uword in_rows, uword in_cols, const uword new_n_nonzero = 0);
inline void arma_cold init_cold(uword in_rows, uword in_cols, const uword new_n_nonzero = 0);
inline void init(uword in_rows, uword in_cols, const uword new_n_nonzero = 0);
arma_cold inline void init_cold(uword in_rows, uword in_cols, const uword new_n_nonzero = 0);
inline void init(const std::string& text);
inline void init(const SpMat<eT>& x);
@@ -669,22 +669,22 @@ class SpMat : public SpBase< eT, SpMat<eT> >
private:
inline arma_hot arma_warn_unused const eT* find_value_csc(const uword in_row, const uword in_col) const;
arma_warn_unused arma_hot inline const eT* find_value_csc(const uword in_row, const uword in_col) const;
inline arma_hot arma_warn_unused eT get_value(const uword i ) const;
inline arma_hot arma_warn_unused eT get_value(const uword in_row, const uword in_col) const;
arma_warn_unused arma_hot inline eT get_value(const uword i ) const;
arma_warn_unused arma_hot inline eT get_value(const uword in_row, const uword in_col) const;
inline arma_hot arma_warn_unused eT get_value_csc(const uword i ) const;
inline arma_hot arma_warn_unused eT get_value_csc(const uword in_row, const uword in_col) const;
arma_warn_unused arma_hot inline eT get_value_csc(const uword i ) const;
arma_warn_unused arma_hot inline eT get_value_csc(const uword in_row, const uword in_col) const;
inline arma_hot arma_warn_unused bool try_set_value_csc(const uword in_row, const uword in_col, const eT in_val);
inline arma_hot arma_warn_unused bool try_add_value_csc(const uword in_row, const uword in_col, const eT in_val);
inline arma_hot arma_warn_unused bool try_sub_value_csc(const uword in_row, const uword in_col, const eT in_val);
inline arma_hot arma_warn_unused bool try_mul_value_csc(const uword in_row, const uword in_col, const eT in_val);
inline arma_hot arma_warn_unused bool try_div_value_csc(const uword in_row, const uword in_col, const eT in_val);
arma_warn_unused arma_hot inline bool try_set_value_csc(const uword in_row, const uword in_col, const eT in_val);
arma_warn_unused arma_hot inline bool try_add_value_csc(const uword in_row, const uword in_col, const eT in_val);
arma_warn_unused arma_hot inline bool try_sub_value_csc(const uword in_row, const uword in_col, const eT in_val);
arma_warn_unused arma_hot inline bool try_mul_value_csc(const uword in_row, const uword in_col, const eT in_val);
arma_warn_unused arma_hot inline bool try_div_value_csc(const uword in_row, const uword in_col, const eT in_val);
inline arma_warn_unused eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0));
inline void delete_element(const uword in_row, const uword in_col);
arma_warn_unused inline eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0));
inline void delete_element(const uword in_row, const uword in_col);
// cache related
include/armadillo_bits/SpMat_iterators_meat.hpp
-34
View File
@@ -150,7 +150,6 @@ SpMat<eT>::const_iterator::const_iterator(const typename SpMat<eT>::const_iterat
template<typename eT>
inline
arma_hot
typename SpMat<eT>::const_iterator&
SpMat<eT>::const_iterator::operator++()
{
@@ -175,7 +174,6 @@ SpMat<eT>::const_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::const_iterator
SpMat<eT>::const_iterator::operator++(int)
{
@@ -190,7 +188,6 @@ SpMat<eT>::const_iterator::operator++(int)
template<typename eT>
inline
arma_hot
typename SpMat<eT>::const_iterator&
SpMat<eT>::const_iterator::operator--()
{
@@ -209,7 +206,6 @@ SpMat<eT>::const_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::const_iterator
SpMat<eT>::const_iterator::operator--(int)
{
@@ -224,7 +220,6 @@ SpMat<eT>::const_iterator::operator--(int)
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator==(const const_iterator& rhs) const
{
@@ -235,7 +230,6 @@ SpMat<eT>::const_iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator!=(const const_iterator& rhs) const
{
@@ -246,7 +240,6 @@ SpMat<eT>::const_iterator::operator!=(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator==(const typename SpSubview<eT>::const_iterator& rhs) const
{
@@ -257,7 +250,6 @@ SpMat<eT>::const_iterator::operator==(const typename SpSubview<eT>::const_iterat
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator!=(const typename SpSubview<eT>::const_iterator& rhs) const
{
@@ -268,7 +260,6 @@ SpMat<eT>::const_iterator::operator!=(const typename SpSubview<eT>::const_iterat
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator==(const const_row_iterator& rhs) const
{
@@ -279,7 +270,6 @@ SpMat<eT>::const_iterator::operator==(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator!=(const const_row_iterator& rhs) const
{
@@ -290,7 +280,6 @@ SpMat<eT>::const_iterator::operator!=(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator==(const typename SpSubview<eT>::const_row_iterator& rhs) const
{
@@ -301,7 +290,6 @@ SpMat<eT>::const_iterator::operator==(const typename SpSubview<eT>::const_row_it
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_iterator::operator!=(const typename SpSubview<eT>::const_row_iterator& rhs) const
{
@@ -316,7 +304,6 @@ SpMat<eT>::const_iterator::operator!=(const typename SpSubview<eT>::const_row_it
template<typename eT>
inline
arma_hot
SpValProxy< SpMat<eT> >
SpMat<eT>::iterator::operator*()
{
@@ -331,7 +318,6 @@ SpMat<eT>::iterator::operator*()
template<typename eT>
inline
arma_hot
typename SpMat<eT>::iterator&
SpMat<eT>::iterator::operator++()
{
@@ -344,7 +330,6 @@ SpMat<eT>::iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::iterator
SpMat<eT>::iterator::operator++(int)
{
@@ -359,7 +344,6 @@ SpMat<eT>::iterator::operator++(int)
template<typename eT>
inline
arma_hot
typename SpMat<eT>::iterator&
SpMat<eT>::iterator::operator--()
{
@@ -372,7 +356,6 @@ SpMat<eT>::iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::iterator
SpMat<eT>::iterator::operator--(int)
{
@@ -573,7 +556,6 @@ SpMat<eT>::const_row_iterator::const_row_iterator(const typename SpMat<eT>::cons
*/
template<typename eT>
inline
arma_hot
typename SpMat<eT>::const_row_iterator&
SpMat<eT>::const_row_iterator::operator++()
{
@@ -699,7 +681,6 @@ SpMat<eT>::const_row_iterator::operator++()
*/
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::const_row_iterator
SpMat<eT>::const_row_iterator::operator++(int)
{
@@ -717,7 +698,6 @@ SpMat<eT>::const_row_iterator::operator++(int)
*/
template<typename eT>
inline
arma_hot
typename SpMat<eT>::const_row_iterator&
SpMat<eT>::const_row_iterator::operator--()
{
@@ -820,7 +800,6 @@ SpMat<eT>::const_row_iterator::operator--()
*/
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::const_row_iterator
SpMat<eT>::const_row_iterator::operator--(int)
{
@@ -835,7 +814,6 @@ SpMat<eT>::const_row_iterator::operator--(int)
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator==(const const_iterator& rhs) const
{
@@ -846,7 +824,6 @@ SpMat<eT>::const_row_iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator!=(const const_iterator& rhs) const
{
@@ -857,7 +834,6 @@ SpMat<eT>::const_row_iterator::operator!=(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator==(const typename SpSubview<eT>::const_iterator& rhs) const
{
@@ -868,7 +844,6 @@ SpMat<eT>::const_row_iterator::operator==(const typename SpSubview<eT>::const_it
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator!=(const typename SpSubview<eT>::const_iterator& rhs) const
{
@@ -879,7 +854,6 @@ SpMat<eT>::const_row_iterator::operator!=(const typename SpSubview<eT>::const_it
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator==(const const_row_iterator& rhs) const
{
@@ -890,7 +864,6 @@ SpMat<eT>::const_row_iterator::operator==(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator!=(const const_row_iterator& rhs) const
{
@@ -901,7 +874,6 @@ SpMat<eT>::const_row_iterator::operator!=(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator==(const typename SpSubview<eT>::const_row_iterator& rhs) const
{
@@ -912,7 +884,6 @@ SpMat<eT>::const_row_iterator::operator==(const typename SpSubview<eT>::const_ro
template<typename eT>
inline
arma_hot
bool
SpMat<eT>::const_row_iterator::operator!=(const typename SpSubview<eT>::const_row_iterator& rhs) const
{
@@ -927,7 +898,6 @@ SpMat<eT>::const_row_iterator::operator!=(const typename SpSubview<eT>::const_ro
template<typename eT>
inline
arma_hot
SpValProxy< SpMat<eT> >
SpMat<eT>::row_iterator::operator*()
{
@@ -942,7 +912,6 @@ SpMat<eT>::row_iterator::operator*()
template<typename eT>
inline
arma_hot
typename SpMat<eT>::row_iterator&
SpMat<eT>::row_iterator::operator++()
{
@@ -955,7 +924,6 @@ SpMat<eT>::row_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::row_iterator
SpMat<eT>::row_iterator::operator++(int)
{
@@ -970,7 +938,6 @@ SpMat<eT>::row_iterator::operator++(int)
template<typename eT>
inline
arma_hot
typename SpMat<eT>::row_iterator&
SpMat<eT>::row_iterator::operator--()
{
@@ -983,7 +950,6 @@ SpMat<eT>::row_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename SpMat<eT>::row_iterator
SpMat<eT>::row_iterator::operator--(int)
{
include/armadillo_bits/SpMat_meat.hpp
+2 -66
View File
@@ -3245,7 +3245,6 @@ SpMat<eT>::shed_cols(const uword in_col1, const uword in_col2)
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat<eT>::operator[](const uword i)
{
@@ -3259,7 +3258,6 @@ SpMat<eT>::operator[](const uword i)
template<typename eT>
arma_inline
arma_warn_unused
eT
SpMat<eT>::operator[](const uword i) const
{
@@ -3270,7 +3268,6 @@ SpMat<eT>::operator[](const uword i) const
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat<eT>::at(const uword i)
{
@@ -3284,7 +3281,6 @@ SpMat<eT>::at(const uword i)
template<typename eT>
arma_inline
arma_warn_unused
eT
SpMat<eT>::at(const uword i) const
{
@@ -3295,7 +3291,6 @@ SpMat<eT>::at(const uword i) const
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat<eT>::operator()(const uword i)
{
@@ -3311,7 +3306,6 @@ SpMat<eT>::operator()(const uword i)
template<typename eT>
arma_inline
arma_warn_unused
eT
SpMat<eT>::operator()(const uword i) const
{
@@ -3331,8 +3325,7 @@ SpMat<eT>::operator()(const uword i) const
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat_MapMat_val<eT>
SpMat<eT>::operator[] (const uword in_row, const uword in_col)
{
return SpMat_MapMat_val<eT>((*this), cache, in_row, in_col);
@@ -3342,8 +3335,7 @@ SpMat<eT>::operator()(const uword i) const
template<typename eT>
arma_inline
arma_warn_unused
eT
eT
SpMat<eT>::operator[] (const uword in_row, const uword in_col) const
{
return get_value(in_row, in_col);
@@ -3355,7 +3347,6 @@ SpMat<eT>::operator()(const uword i) const
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat<eT>::at(const uword in_row, const uword in_col)
{
@@ -3366,7 +3357,6 @@ SpMat<eT>::at(const uword in_row, const uword in_col)
template<typename eT>
arma_inline
arma_warn_unused
eT
SpMat<eT>::at(const uword in_row, const uword in_col) const
{
@@ -3377,7 +3367,6 @@ SpMat<eT>::at(const uword in_row, const uword in_col) const
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat<eT>::operator()(const uword in_row, const uword in_col)
{
@@ -3390,7 +3379,6 @@ SpMat<eT>::operator()(const uword in_row, const uword in_col)
template<typename eT>
arma_inline
arma_warn_unused
eT
SpMat<eT>::operator()(const uword in_row, const uword in_col) const
{
@@ -3406,7 +3394,6 @@ SpMat<eT>::operator()(const uword in_row, const uword in_col) const
*/
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::is_empty() const
{
@@ -3418,7 +3405,6 @@ SpMat<eT>::is_empty() const
//! returns true if the object can be interpreted as a column or row vector
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::is_vec() const
{
@@ -3430,7 +3416,6 @@ SpMat<eT>::is_vec() const
//! returns true if the object can be interpreted as a row vector
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::is_rowvec() const
{
@@ -3442,7 +3427,6 @@ SpMat<eT>::is_rowvec() const
//! returns true if the object can be interpreted as a column vector
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::is_colvec() const
{
@@ -3454,7 +3438,6 @@ SpMat<eT>::is_colvec() const
//! returns true if the object has the same number of non-zero rows and columnns
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::is_square() const
{
@@ -3466,7 +3449,6 @@ SpMat<eT>::is_square() const
//! returns true if all of the elements are finite
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::is_finite() const
{
@@ -3481,7 +3463,6 @@ SpMat<eT>::is_finite() const
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::is_symmetric() const
{
@@ -3500,7 +3481,6 @@ SpMat<eT>::is_symmetric() const
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::is_symmetric(const typename get_pod_type<elem_type>::result tol) const
{
@@ -3529,7 +3509,6 @@ SpMat<eT>::is_symmetric(const typename get_pod_type<elem_type>::result tol) cons
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::is_hermitian() const
{
@@ -3548,7 +3527,6 @@ SpMat<eT>::is_hermitian() const
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::is_hermitian(const typename get_pod_type<elem_type>::result tol) const
{
@@ -3577,7 +3555,6 @@ SpMat<eT>::is_hermitian(const typename get_pod_type<elem_type>::result tol) cons
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::has_inf() const
{
@@ -3592,7 +3569,6 @@ SpMat<eT>::has_inf() const
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::has_nan() const
{
@@ -3607,7 +3583,6 @@ SpMat<eT>::has_nan() const
template<typename eT>
inline
arma_warn_unused
bool
SpMat<eT>::has_nonfinite() const
{
@@ -3623,7 +3598,6 @@ SpMat<eT>::has_nonfinite() const
//! returns true if the given index is currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::in_range(const uword i) const
{
@@ -3634,7 +3608,6 @@ SpMat<eT>::in_range(const uword i) const
//! returns true if the given start and end indices are currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::in_range(const span& x) const
{
@@ -3658,7 +3631,6 @@ SpMat<eT>::in_range(const span& x) const
//! returns true if the given location is currently in range
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::in_range(const uword in_row, const uword in_col) const
{
@@ -3669,7 +3641,6 @@ SpMat<eT>::in_range(const uword in_row, const uword in_col) const
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::in_range(const span& row_span, const uword in_col) const
{
@@ -3692,7 +3663,6 @@ SpMat<eT>::in_range(const span& row_span, const uword in_col) const
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::in_range(const uword in_row, const span& col_span) const
{
@@ -3715,7 +3685,6 @@ SpMat<eT>::in_range(const uword in_row, const span& col_span) const
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::in_range(const span& row_span, const span& col_span) const
{
@@ -3737,7 +3706,6 @@ SpMat<eT>::in_range(const span& row_span, const span& col_span) const
template<typename eT>
arma_inline
arma_warn_unused
bool
SpMat<eT>::in_range(const uword in_row, const uword in_col, const SizeMat& s) const
{
@@ -4617,7 +4585,6 @@ SpMat<eT>::set_imag(const SpBase<typename SpMat<eT>::pod_type,T1>& X)
//! save the matrix to a file
template<typename eT>
inline
arma_cold
bool
SpMat<eT>::save(const std::string name, const file_type type) const
{
@@ -4659,7 +4626,6 @@ SpMat<eT>::save(const std::string name, const file_type type) const
template<typename eT>
inline
arma_cold
bool
SpMat<eT>::save(const csv_name& spec, const file_type type) const
{
@@ -4736,7 +4702,6 @@ SpMat<eT>::save(const csv_name& spec, const file_type type) const
//! save the matrix to a stream
template<typename eT>
inline
arma_cold
bool
SpMat<eT>::save(std::ostream& os, const file_type type) const
{
@@ -4779,7 +4744,6 @@ SpMat<eT>::save(std::ostream& os, const file_type type) const
//! load a matrix from a file
template<typename eT>
inline
arma_cold
bool
SpMat<eT>::load(const std::string name, const file_type type)
{
@@ -4838,7 +4802,6 @@ SpMat<eT>::load(const std::string name, const file_type type)
template<typename eT>
inline
arma_cold
bool
SpMat<eT>::load(const csv_name& spec, const file_type type)
{
@@ -4929,7 +4892,6 @@ SpMat<eT>::load(const csv_name& spec, const file_type type)
//! load a matrix from a stream
template<typename eT>
inline
arma_cold
bool
SpMat<eT>::load(std::istream& is, const file_type type)
{
@@ -5068,7 +5030,6 @@ SpMat<eT>::init(uword in_rows, uword in_cols, const uword new_n_nonzero)
template<typename eT>
inline
void
arma_cold
SpMat<eT>::init_cold(uword in_rows, uword in_cols, const uword new_n_nonzero)
{
arma_extra_debug_sigprint();
@@ -6308,7 +6269,6 @@ SpMat<eT>::size() const
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat<eT>::front()
{
@@ -6321,7 +6281,6 @@ SpMat<eT>::front()
template<typename eT>
arma_inline
arma_warn_unused
eT
SpMat<eT>::front() const
{
@@ -6334,7 +6293,6 @@ SpMat<eT>::front() const
template<typename eT>
arma_inline
arma_warn_unused
SpMat_MapMat_val<eT>
SpMat<eT>::back()
{
@@ -6347,7 +6305,6 @@ SpMat<eT>::back()
template<typename eT>
arma_inline
arma_warn_unused
eT
SpMat<eT>::back() const
{
@@ -6360,8 +6317,6 @@ SpMat<eT>::back() const
template<typename eT>
inline
arma_hot
arma_warn_unused
eT
SpMat<eT>::get_value(const uword i) const
{
@@ -6376,8 +6331,6 @@ SpMat<eT>::get_value(const uword i) const
template<typename eT>
inline
arma_hot
arma_warn_unused
eT
SpMat<eT>::get_value(const uword in_row, const uword in_col) const
{
@@ -6392,8 +6345,6 @@ SpMat<eT>::get_value(const uword in_row, const uword in_col) const
template<typename eT>
inline
arma_hot
arma_warn_unused
eT
SpMat<eT>::get_value_csc(const uword i) const
{
@@ -6408,8 +6359,6 @@ SpMat<eT>::get_value_csc(const uword i) const
template<typename eT>
inline
arma_hot
arma_warn_unused
const eT*
SpMat<eT>::find_value_csc(const uword in_row, const uword in_col) const
{
@@ -6436,8 +6385,6 @@ SpMat<eT>::find_value_csc(const uword in_row, const uword in_col) const
template<typename eT>
inline
arma_hot
arma_warn_unused
eT
SpMat<eT>::get_value_csc(const uword in_row, const uword in_col) const
{
@@ -6450,8 +6397,6 @@ SpMat<eT>::get_value_csc(const uword in_row, const uword in_col) const
template<typename eT>
inline
arma_hot
arma_warn_unused
bool
SpMat<eT>::try_set_value_csc(const uword in_row, const uword in_col, const eT in_val)
{
@@ -6474,8 +6419,6 @@ SpMat<eT>::try_set_value_csc(const uword in_row, const uword in_col, const eT in
template<typename eT>
inline
arma_hot
arma_warn_unused
bool
SpMat<eT>::try_add_value_csc(const uword in_row, const uword in_col, const eT in_val)
{
@@ -6500,8 +6443,6 @@ SpMat<eT>::try_add_value_csc(const uword in_row, const uword in_col, const eT in
template<typename eT>
inline
arma_hot
arma_warn_unused
bool
SpMat<eT>::try_sub_value_csc(const uword in_row, const uword in_col, const eT in_val)
{
@@ -6526,8 +6467,6 @@ SpMat<eT>::try_sub_value_csc(const uword in_row, const uword in_col, const eT in
template<typename eT>
inline
arma_hot
arma_warn_unused
bool
SpMat<eT>::try_mul_value_csc(const uword in_row, const uword in_col, const eT in_val)
{
@@ -6552,8 +6491,6 @@ SpMat<eT>::try_mul_value_csc(const uword in_row, const uword in_col, const eT in
template<typename eT>
inline
arma_hot
arma_warn_unused
bool
SpMat<eT>::try_div_value_csc(const uword in_row, const uword in_col, const eT in_val)
{
@@ -6583,7 +6520,6 @@ SpMat<eT>::try_div_value_csc(const uword in_row, const uword in_col, const eT in
*/
template<typename eT>
inline
arma_warn_unused
eT&
SpMat<eT>::insert_element(const uword in_row, const uword in_col, const eT val)
{
include/armadillo_bits/SpRow_bones.hpp
+3 -3
View File
@@ -56,9 +56,9 @@ class SpRow : public SpMat<eT>
template<typename T1, typename T2>
inline explicit SpRow(const SpBase<pod_type,T1>& A, const SpBase<pod_type,T2>& B);
inline arma_warn_unused const SpOp<SpRow<eT>,spop_htrans> t() const;
inline arma_warn_unused const SpOp<SpRow<eT>,spop_htrans> ht() const;
inline arma_warn_unused const SpOp<SpRow<eT>,spop_strans> st() const;
arma_warn_unused inline const SpOp<SpRow<eT>,spop_htrans> t() const;
arma_warn_unused inline const SpOp<SpRow<eT>,spop_htrans> ht() const;
arma_warn_unused inline const SpOp<SpRow<eT>,spop_strans> st() const;
inline void shed_col (const uword col_num);
inline void shed_cols(const uword in_col1, const uword in_col2);
include/armadillo_bits/SpRow_meat.hpp
-3
View File
@@ -204,7 +204,6 @@ SpRow<eT>::SpRow
template<typename eT>
inline
arma_warn_unused
const SpOp<SpRow<eT>,spop_htrans>
SpRow<eT>::t() const
{
@@ -215,7 +214,6 @@ SpRow<eT>::t() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpRow<eT>,spop_htrans>
SpRow<eT>::ht() const
{
@@ -226,7 +224,6 @@ SpRow<eT>::ht() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpRow<eT>,spop_strans>
SpRow<eT>::st() const
{
include/armadillo_bits/SpSubview_bones.hpp
+42 -42
View File
@@ -197,23 +197,23 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
// Don't hold location internally; call "dummy" methods to get that information.
arma_inline uword row() const { return iterator_base::M->m.row_indices[iterator_base::internal_pos + skip_pos] - iterator_base::M->aux_row1; }
inline arma_hot const_iterator& operator++();
inline arma_warn_unused const_iterator operator++(int);
arma_hot inline const_iterator& operator++();
arma_warn_unused inline const_iterator operator++(int);
inline arma_hot const_iterator& operator--();
inline arma_warn_unused const_iterator operator--(int);
arma_hot inline const_iterator& operator--();
arma_warn_unused inline const_iterator operator--(int);
inline arma_hot bool operator!=(const const_iterator& rhs) const;
inline arma_hot bool operator==(const const_iterator& rhs) const;
arma_hot inline bool operator!=(const const_iterator& rhs) const;
arma_hot inline bool operator==(const const_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpMat<eT>::const_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpMat<eT>::const_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpMat<eT>::const_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpMat<eT>::const_iterator& rhs) const;
inline arma_hot bool operator!=(const const_row_iterator& rhs) const;
inline arma_hot bool operator==(const const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const const_row_iterator& rhs) const;
arma_hot inline bool operator==(const const_row_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpMat<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpMat<eT>::const_row_iterator& rhs) const;
arma_aligned uword skip_pos; // not used in row_iterator or const_row_iterator
};
@@ -227,14 +227,14 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
inline iterator(SpSubview& in_M, const uword in_row, const uword in_col, const uword in_pos, const uword in_skip_pos) : const_iterator(in_M, in_row, in_col, in_pos, in_skip_pos) { }
inline iterator(const iterator& other) : const_iterator(other) { }
inline arma_hot SpValProxy< SpSubview<eT> > operator*();
arma_hot inline SpValProxy< SpSubview<eT> > operator*();
// overloads needed for return type correctness
inline arma_hot iterator& operator++();
inline arma_warn_unused iterator operator++(int);
arma_hot inline iterator& operator++();
arma_warn_unused inline iterator operator++(int);
inline arma_hot iterator& operator--();
inline arma_warn_unused iterator operator--(int);
arma_hot inline iterator& operator--();
arma_warn_unused inline iterator operator--(int);
// This has a different value_type than iterator_base.
typedef SpValProxy< SpSubview<eT> > value_type;
@@ -251,11 +251,11 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
inline const_row_iterator(const SpSubview& in_M, uword in_row, uword in_col);
inline const_row_iterator(const const_row_iterator& other);
inline arma_hot const_row_iterator& operator++();
inline arma_warn_unused const_row_iterator operator++(int);
arma_hot inline const_row_iterator& operator++();
arma_warn_unused inline const_row_iterator operator++(int);
inline arma_hot const_row_iterator& operator--();
inline arma_warn_unused const_row_iterator operator--(int);
arma_hot inline const_row_iterator& operator--();
arma_warn_unused inline const_row_iterator operator--(int);
uword internal_row; // Hold row internally because we use internal_pos differently.
uword actual_pos; // Actual position in subview's parent matrix.
@@ -264,17 +264,17 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
arma_inline uword row() const { return internal_row; }
inline arma_hot bool operator!=(const const_iterator& rhs) const;
inline arma_hot bool operator==(const const_iterator& rhs) const;
arma_hot inline bool operator!=(const const_iterator& rhs) const;
arma_hot inline bool operator==(const const_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpMat<eT>::const_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpMat<eT>::const_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpMat<eT>::const_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpMat<eT>::const_iterator& rhs) const;
inline arma_hot bool operator!=(const const_row_iterator& rhs) const;
inline arma_hot bool operator==(const const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const const_row_iterator& rhs) const;
arma_hot inline bool operator==(const const_row_iterator& rhs) const;
inline arma_hot bool operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const;
inline arma_hot bool operator==(const typename SpMat<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const;
arma_hot inline bool operator==(const typename SpMat<eT>::const_row_iterator& rhs) const;
};
class row_iterator : public const_row_iterator
@@ -285,14 +285,14 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
inline row_iterator(SpSubview& in_M, uword in_row, uword in_col) : const_row_iterator(in_M, in_row, in_col) { }
inline row_iterator(const row_iterator& other) : const_row_iterator(other) { }
inline arma_hot SpValProxy< SpSubview<eT> > operator*();
arma_hot inline SpValProxy< SpSubview<eT> > operator*();
// overloads needed for return type correctness
inline arma_hot row_iterator& operator++();
inline arma_warn_unused row_iterator operator++(int);
arma_hot inline row_iterator& operator++();
arma_warn_unused inline row_iterator operator++(int);
inline arma_hot row_iterator& operator--();
inline arma_warn_unused row_iterator operator--(int);
arma_hot inline row_iterator& operator--();
arma_warn_unused inline row_iterator operator--(int);
// This has a different value_type than iterator_base.
typedef SpValProxy< SpSubview<eT> > value_type;
@@ -331,8 +331,8 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
friend class SpSubview_row<eT>;
friend class SpValProxy< SpSubview<eT> >; // allow SpValProxy to call insert_element() and delete_element()
inline arma_warn_unused eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0));
inline void delete_element(const uword in_row, const uword in_col);
arma_warn_unused inline eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0));
inline void delete_element(const uword in_row, const uword in_col);
inline void invalidate_cache() const;
};
@@ -357,9 +357,9 @@ class SpSubview_col : public SpSubview<eT>
template<typename T1> inline void operator= (const SpBase<eT,T1>& x);
template<typename T1> inline void operator= (const Base<eT,T1>& x);
inline arma_warn_unused const SpOp<SpSubview_col<eT>,spop_htrans> t() const;
inline arma_warn_unused const SpOp<SpSubview_col<eT>,spop_htrans> ht() const;
inline arma_warn_unused const SpOp<SpSubview_col<eT>,spop_strans> st() const;
arma_warn_unused inline const SpOp<SpSubview_col<eT>,spop_htrans> t() const;
arma_warn_unused inline const SpOp<SpSubview_col<eT>,spop_htrans> ht() const;
arma_warn_unused inline const SpOp<SpSubview_col<eT>,spop_strans> st() const;
protected:
@@ -395,9 +395,9 @@ class SpSubview_row : public SpSubview<eT>
template<typename T1> inline void operator= (const SpBase<eT,T1>& x);
template<typename T1> inline void operator= (const Base<eT,T1>& x);
inline arma_warn_unused const SpOp<SpSubview_row<eT>,spop_htrans> t() const;
inline arma_warn_unused const SpOp<SpSubview_row<eT>,spop_htrans> ht() const;
inline arma_warn_unused const SpOp<SpSubview_row<eT>,spop_strans> st() const;
arma_warn_unused inline const SpOp<SpSubview_row<eT>,spop_htrans> t() const;
arma_warn_unused inline const SpOp<SpSubview_row<eT>,spop_htrans> ht() const;
arma_warn_unused inline const SpOp<SpSubview_row<eT>,spop_strans> st() const;
protected:
include/armadillo_bits/SpSubview_iterators_meat.hpp
-34
View File
@@ -280,7 +280,6 @@ SpSubview<eT>::const_iterator::operator*() const
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::const_iterator&
SpSubview<eT>::const_iterator::operator++()
{
@@ -339,7 +338,6 @@ SpSubview<eT>::const_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::const_iterator
SpSubview<eT>::const_iterator::operator++(int)
{
@@ -354,7 +352,6 @@ SpSubview<eT>::const_iterator::operator++(int)
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::const_iterator&
SpSubview<eT>::const_iterator::operator--()
{
@@ -410,7 +407,6 @@ SpSubview<eT>::const_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::const_iterator
SpSubview<eT>::const_iterator::operator--(int)
{
@@ -425,7 +421,6 @@ SpSubview<eT>::const_iterator::operator--(int)
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator==(const const_iterator& rhs) const
{
@@ -436,7 +431,6 @@ SpSubview<eT>::const_iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator!=(const const_iterator& rhs) const
{
@@ -447,7 +441,6 @@ SpSubview<eT>::const_iterator::operator!=(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator==(const typename SpMat<eT>::const_iterator& rhs) const
{
@@ -458,7 +451,6 @@ SpSubview<eT>::const_iterator::operator==(const typename SpMat<eT>::const_iterat
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator!=(const typename SpMat<eT>::const_iterator& rhs) const
{
@@ -469,7 +461,6 @@ SpSubview<eT>::const_iterator::operator!=(const typename SpMat<eT>::const_iterat
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator==(const const_row_iterator& rhs) const
{
@@ -480,7 +471,6 @@ SpSubview<eT>::const_iterator::operator==(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator!=(const const_row_iterator& rhs) const
{
@@ -491,7 +481,6 @@ SpSubview<eT>::const_iterator::operator!=(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator==(const typename SpMat<eT>::const_row_iterator& rhs) const
{
@@ -502,7 +491,6 @@ SpSubview<eT>::const_iterator::operator==(const typename SpMat<eT>::const_row_it
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_iterator::operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const
{
@@ -517,7 +505,6 @@ SpSubview<eT>::const_iterator::operator!=(const typename SpMat<eT>::const_row_it
template<typename eT>
inline
arma_hot
SpValProxy< SpSubview<eT> >
SpSubview<eT>::iterator::operator*()
{
@@ -532,7 +519,6 @@ SpSubview<eT>::iterator::operator*()
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::iterator&
SpSubview<eT>::iterator::operator++()
{
@@ -544,7 +530,6 @@ SpSubview<eT>::iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::iterator
SpSubview<eT>::iterator::operator++(int)
{
@@ -559,7 +544,6 @@ SpSubview<eT>::iterator::operator++(int)
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::iterator&
SpSubview<eT>::iterator::operator--()
{
@@ -571,7 +555,6 @@ SpSubview<eT>::iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::iterator
SpSubview<eT>::iterator::operator--(int)
{
@@ -770,7 +753,6 @@ SpSubview<eT>::const_row_iterator::const_row_iterator(const const_row_iterator&
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::const_row_iterator&
SpSubview<eT>::const_row_iterator::operator++()
{
@@ -897,7 +879,6 @@ SpSubview<eT>::const_row_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::const_row_iterator
SpSubview<eT>::const_row_iterator::operator++(int)
{
@@ -912,7 +893,6 @@ SpSubview<eT>::const_row_iterator::operator++(int)
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::const_row_iterator&
SpSubview<eT>::const_row_iterator::operator--()
{
@@ -1012,7 +992,6 @@ SpSubview<eT>::const_row_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::const_row_iterator
SpSubview<eT>::const_row_iterator::operator--(int)
{
@@ -1027,7 +1006,6 @@ SpSubview<eT>::const_row_iterator::operator--(int)
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator==(const const_iterator& rhs) const
{
@@ -1038,7 +1016,6 @@ SpSubview<eT>::const_row_iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator!=(const const_iterator& rhs) const
{
@@ -1049,7 +1026,6 @@ SpSubview<eT>::const_row_iterator::operator!=(const const_iterator& rhs) const
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator==(const typename SpMat<eT>::const_iterator& rhs) const
{
@@ -1060,7 +1036,6 @@ SpSubview<eT>::const_row_iterator::operator==(const typename SpMat<eT>::const_it
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::const_iterator& rhs) const
{
@@ -1071,7 +1046,6 @@ SpSubview<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::const_it
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator==(const const_row_iterator& rhs) const
{
@@ -1082,7 +1056,6 @@ SpSubview<eT>::const_row_iterator::operator==(const const_row_iterator& rhs) con
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator!=(const const_row_iterator& rhs) const
{
@@ -1093,7 +1066,6 @@ SpSubview<eT>::const_row_iterator::operator!=(const const_row_iterator& rhs) con
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator==(const typename SpMat<eT>::const_row_iterator& rhs) const
{
@@ -1104,7 +1076,6 @@ SpSubview<eT>::const_row_iterator::operator==(const typename SpMat<eT>::const_ro
template<typename eT>
inline
arma_hot
bool
SpSubview<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const
{
@@ -1119,7 +1090,6 @@ SpSubview<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::const_ro
template<typename eT>
inline
arma_hot
SpValProxy< SpSubview<eT> >
SpSubview<eT>::row_iterator::operator*()
{
@@ -1134,7 +1104,6 @@ SpSubview<eT>::row_iterator::operator*()
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::row_iterator&
SpSubview<eT>::row_iterator::operator++()
{
@@ -1146,7 +1115,6 @@ SpSubview<eT>::row_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::row_iterator
SpSubview<eT>::row_iterator::operator++(int)
{
@@ -1161,7 +1129,6 @@ SpSubview<eT>::row_iterator::operator++(int)
template<typename eT>
inline
arma_hot
typename SpSubview<eT>::row_iterator&
SpSubview<eT>::row_iterator::operator--()
{
@@ -1173,7 +1140,6 @@ SpSubview<eT>::row_iterator::operator--()
template<typename eT>
inline
arma_warn_unused
typename SpSubview<eT>::row_iterator
SpSubview<eT>::row_iterator::operator--(int)
{
include/armadillo_bits/SpSubview_meat.hpp
-17
View File
@@ -941,7 +941,6 @@ SpSubview<eT>::randn()
template<typename eT>
arma_hot
inline
SpSubview_MapMat_val<eT>
SpSubview<eT>::operator[](const uword i)
@@ -955,7 +954,6 @@ SpSubview<eT>::operator[](const uword i)
template<typename eT>
arma_hot
inline
eT
SpSubview<eT>::operator[](const uword i) const
@@ -969,7 +967,6 @@ SpSubview<eT>::operator[](const uword i) const
template<typename eT>
arma_hot
inline
SpSubview_MapMat_val<eT>
SpSubview<eT>::operator()(const uword i)
@@ -985,7 +982,6 @@ SpSubview<eT>::operator()(const uword i)
template<typename eT>
arma_hot
inline
eT
SpSubview<eT>::operator()(const uword i) const
@@ -1001,7 +997,6 @@ SpSubview<eT>::operator()(const uword i) const
template<typename eT>
arma_hot
inline
SpSubview_MapMat_val<eT>
SpSubview<eT>::operator()(const uword in_row, const uword in_col)
@@ -1014,7 +1009,6 @@ SpSubview<eT>::operator()(const uword in_row, const uword in_col)
template<typename eT>
arma_hot
inline
eT
SpSubview<eT>::operator()(const uword in_row, const uword in_col) const
@@ -1027,7 +1021,6 @@ SpSubview<eT>::operator()(const uword in_row, const uword in_col) const
template<typename eT>
arma_hot
inline
SpSubview_MapMat_val<eT>
SpSubview<eT>::at(const uword i)
@@ -1041,7 +1034,6 @@ SpSubview<eT>::at(const uword i)
template<typename eT>
arma_hot
inline
eT
SpSubview<eT>::at(const uword i) const
@@ -1055,7 +1047,6 @@ SpSubview<eT>::at(const uword i) const
template<typename eT>
arma_hot
inline
SpSubview_MapMat_val<eT>
SpSubview<eT>::at(const uword in_row, const uword in_col)
@@ -1066,7 +1057,6 @@ SpSubview<eT>::at(const uword in_row, const uword in_col)
template<typename eT>
arma_hot
inline
eT
SpSubview<eT>::at(const uword in_row, const uword in_col) const
@@ -1642,7 +1632,6 @@ SpSubview<eT>::is_alias(const SpMat<eT>& X) const
template<typename eT>
inline
arma_warn_unused
eT&
SpSubview<eT>::insert_element(const uword in_row, const uword in_col, const eT in_val)
{
@@ -1764,7 +1753,6 @@ SpSubview_col<eT>::operator=(const Base<eT,T1>& x)
template<typename eT>
inline
arma_warn_unused
const SpOp<SpSubview_col<eT>,spop_htrans>
SpSubview_col<eT>::t() const
{
@@ -1775,7 +1763,6 @@ SpSubview_col<eT>::t() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpSubview_col<eT>,spop_htrans>
SpSubview_col<eT>::ht() const
{
@@ -1786,7 +1773,6 @@ SpSubview_col<eT>::ht() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpSubview_col<eT>,spop_strans>
SpSubview_col<eT>::st() const
{
@@ -1873,7 +1859,6 @@ SpSubview_row<eT>::operator=(const Base<eT,T1>& x)
template<typename eT>
inline
arma_warn_unused
const SpOp<SpSubview_row<eT>,spop_htrans>
SpSubview_row<eT>::t() const
{
@@ -1884,7 +1869,6 @@ SpSubview_row<eT>::t() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpSubview_row<eT>,spop_htrans>
SpSubview_row<eT>::ht() const
{
@@ -1895,7 +1879,6 @@ SpSubview_row<eT>::ht() const
template<typename eT>
inline
arma_warn_unused
const SpOp<SpSubview_row<eT>,spop_strans>
SpSubview_row<eT>::st() const
{
include/armadillo_bits/arma_ostream_meat.hpp
-11
View File
@@ -425,7 +425,6 @@ arma_ostream::raw_print_elem(std::ostream& o, const std::complex<T>& x)
//! Print a matrix to the specified stream
template<typename eT>
arma_cold
inline
void
arma_ostream::print(std::ostream& o, const Mat<eT>& m, const bool modify)
@@ -495,7 +494,6 @@ arma_ostream::print(std::ostream& o, const Mat<eT>& m, const bool modify)
//! Print a cube to the specified stream
template<typename eT>
arma_cold
inline
void
arma_ostream::print(std::ostream& o, const Cube<eT>& x, const bool modify)
@@ -538,7 +536,6 @@ arma_ostream::print(std::ostream& o, const Cube<eT>& x, const bool modify)
//! Print a field to the specified stream
//! Assumes type oT can be printed, ie. oT has std::ostream& operator<< (std::ostream&, const oT&)
template<typename oT>
arma_cold
inline
void
arma_ostream::print(std::ostream& o, const field<oT>& x)
@@ -612,7 +609,6 @@ arma_ostream::print(std::ostream& o, const field<oT>& x)
//! Print a subfield to the specified stream
//! Assumes type oT can be printed, ie. oT has std::ostream& operator<< (std::ostream&, const oT&)
template<typename oT>
arma_cold
inline
void
arma_ostream::print(std::ostream& o, const subview_field<oT>& x)
@@ -683,7 +679,6 @@ arma_ostream::print(std::ostream& o, const subview_field<oT>& x)
template<typename eT>
arma_cold
inline
void
arma_ostream::print_dense(std::ostream& o, const SpMat<eT>& m, const bool modify)
@@ -766,7 +761,6 @@ arma_ostream::print_dense(std::ostream& o, const SpMat<eT>& m, const bool modify
template<typename eT>
arma_cold
inline
void
arma_ostream::print(std::ostream& o, const SpMat<eT>& m, const bool modify)
@@ -869,7 +863,6 @@ arma_ostream::print(std::ostream& o, const SpMat<eT>& m, const bool modify)
arma_cold
inline
void
arma_ostream::print(std::ostream& o, const SizeMat& S)
@@ -891,7 +884,6 @@ arma_ostream::print(std::ostream& o, const SizeMat& S)
arma_cold
inline
void
arma_ostream::print(std::ostream& o, const SizeCube& S)
@@ -914,7 +906,6 @@ arma_ostream::print(std::ostream& o, const SizeCube& S)
template<typename eT>
arma_cold
inline
void
arma_ostream::brief_print(std::ostream& o, const Mat<eT>& m, const bool print_size)
@@ -1073,7 +1064,6 @@ arma_ostream::brief_print(std::ostream& o, const Mat<eT>& m, const bool print_si
template<typename eT>
arma_cold
inline
void
arma_ostream::brief_print(std::ostream& o, const Cube<eT>& x)
@@ -1131,7 +1121,6 @@ arma_ostream::brief_print(std::ostream& o, const Cube<eT>& x)
template<typename eT>
arma_cold
inline
void
arma_ostream::brief_print(std::ostream& o, const SpMat<eT>& m)
include/armadillo_bits/arrayops_meat.hpp
-32
View File
@@ -55,7 +55,6 @@ arrayops::fill_zeros(eT* dest, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::replace(eT* mem, const uword n_elem, const eT old_val, const eT new_val)
@@ -83,7 +82,6 @@ arrayops::replace(eT* mem, const uword n_elem, const eT old_val, const eT new_va
template<typename eT>
arma_hot
inline
void
arrayops::clean(eT* mem, const uword n_elem, const eT abs_limit, const typename arma_not_cx<eT>::result* junk)
@@ -101,7 +99,6 @@ arrayops::clean(eT* mem, const uword n_elem, const eT abs_limit, const typename
template<typename T>
arma_hot
inline
void
arrayops::clean(std::complex<T>* mem, const uword n_elem, const T abs_limit)
@@ -234,7 +231,6 @@ arrayops::convert_cx_scalar
template<typename out_eT, typename in_eT>
arma_hot
inline
void
arrayops::convert(out_eT* dest, const in_eT* src, const uword n_elem)
@@ -304,7 +300,6 @@ arrayops::convert(out_eT* dest, const in_eT* src, const uword n_elem)
template<typename out_eT, typename in_eT>
arma_hot
inline
void
arrayops::convert_cx(out_eT* dest, const in_eT* src, const uword n_elem)
@@ -326,7 +321,6 @@ arrayops::convert_cx(out_eT* dest, const in_eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_plus(eT* dest, const eT* src, const uword n_elem)
@@ -364,7 +358,6 @@ arrayops::inplace_plus(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_minus(eT* dest, const eT* src, const uword n_elem)
@@ -402,7 +395,6 @@ arrayops::inplace_minus(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_mul(eT* dest, const eT* src, const uword n_elem)
@@ -440,7 +432,6 @@ arrayops::inplace_mul(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_div(eT* dest, const eT* src, const uword n_elem)
@@ -478,7 +469,6 @@ arrayops::inplace_div(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_plus_base(eT* dest, const eT* src, const uword n_elem)
@@ -514,7 +504,6 @@ arrayops::inplace_plus_base(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_minus_base(eT* dest, const eT* src, const uword n_elem)
@@ -550,7 +539,6 @@ arrayops::inplace_minus_base(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_mul_base(eT* dest, const eT* src, const uword n_elem)
@@ -586,7 +574,6 @@ arrayops::inplace_mul_base(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_div_base(eT* dest, const eT* src, const uword n_elem)
@@ -622,7 +609,6 @@ arrayops::inplace_div_base(eT* dest, const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_set(eT* dest, const eT val, const uword n_elem)
@@ -640,7 +626,6 @@ arrayops::inplace_set(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_set_simple(eT* dest, const eT val, const uword n_elem)
@@ -660,7 +645,6 @@ arrayops::inplace_set_simple(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_set_base(eT* dest, const eT val, const uword n_elem)
@@ -693,7 +677,6 @@ arrayops::inplace_set_base(eT* dest, const eT val, const uword n_elem)
template<typename eT, const uword n_elem>
arma_hot
inline
void
arrayops::inplace_set_fixed(eT* dest, const eT val)
@@ -707,7 +690,6 @@ arrayops::inplace_set_fixed(eT* dest, const eT val)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_plus(eT* dest, const eT val, const uword n_elem)
@@ -727,7 +709,6 @@ arrayops::inplace_plus(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_minus(eT* dest, const eT val, const uword n_elem)
@@ -747,7 +728,6 @@ arrayops::inplace_minus(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_mul(eT* dest, const eT val, const uword n_elem)
@@ -767,7 +747,6 @@ arrayops::inplace_mul(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_div(eT* dest, const eT val, const uword n_elem)
@@ -787,7 +766,6 @@ arrayops::inplace_div(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_plus_base(eT* dest, const eT val, const uword n_elem)
@@ -820,7 +798,6 @@ arrayops::inplace_plus_base(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_minus_base(eT* dest, const eT val, const uword n_elem)
@@ -853,7 +830,6 @@ arrayops::inplace_minus_base(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_mul_base(eT* dest, const eT val, const uword n_elem)
@@ -886,7 +862,6 @@ arrayops::inplace_mul_base(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
void
arrayops::inplace_div_base(eT* dest, const eT val, const uword n_elem)
@@ -919,7 +894,6 @@ arrayops::inplace_div_base(eT* dest, const eT val, const uword n_elem)
template<typename eT>
arma_hot
inline
eT
arrayops::accumulate(const eT* src, const uword n_elem)
@@ -966,7 +940,6 @@ arrayops::accumulate(const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
eT
arrayops::product(const eT* src, const uword n_elem)
@@ -993,7 +966,6 @@ arrayops::product(const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
bool
arrayops::is_zero(const eT* mem, const uword n_elem, const eT abs_limit, const typename arma_not_cx<eT>::result* junk)
@@ -1023,7 +995,6 @@ arrayops::is_zero(const eT* mem, const uword n_elem, const eT abs_limit, const t
template<typename T>
arma_hot
inline
bool
arrayops::is_zero(const std::complex<T>* mem, const uword n_elem, const T abs_limit)
@@ -1059,7 +1030,6 @@ arrayops::is_zero(const std::complex<T>* mem, const uword n_elem, const T abs_li
template<typename eT>
arma_hot
inline
bool
arrayops::is_finite(const eT* src, const uword n_elem)
@@ -1086,7 +1056,6 @@ arrayops::is_finite(const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
bool
arrayops::has_inf(const eT* src, const uword n_elem)
@@ -1112,7 +1081,6 @@ arrayops::has_inf(const eT* src, const uword n_elem)
template<typename eT>
arma_hot
inline
bool
arrayops::has_nan(const eT* src, const uword n_elem)
include/armadillo_bits/compiler_setup.hpp
+4 -3
View File
@@ -394,9 +394,10 @@
#endif
// #if defined(ARMA_HAVE_CXX17)
// #define arma_warn_unused [[nodiscard]]
// #endif
#if defined(ARMA_HAVE_CXX17)
#undef arma_warn_unused
#define arma_warn_unused [[nodiscard]]
#endif
#if !defined(ARMA_DONT_USE_OPENMP)
include/armadillo_bits/diskio_bones.hpp
+9 -9
View File
@@ -40,21 +40,21 @@ class diskio
friend class SpMat_aux;
friend class field_aux;
template<typename eT> inline arma_cold static std::string gen_txt_header(const Mat<eT>&);
template<typename eT> inline arma_cold static std::string gen_bin_header(const Mat<eT>&);
template<typename eT> arma_cold inline static std::string gen_txt_header(const Mat<eT>&);
template<typename eT> arma_cold inline static std::string gen_bin_header(const Mat<eT>&);
template<typename eT> inline arma_cold static std::string gen_bin_header(const SpMat<eT>&);
template<typename eT> arma_cold inline static std::string gen_bin_header(const SpMat<eT>&);
template<typename eT> inline arma_cold static std::string gen_txt_header(const Cube<eT>&);
template<typename eT> inline arma_cold static std::string gen_bin_header(const Cube<eT>&);
template<typename eT> arma_cold inline static std::string gen_txt_header(const Cube<eT>&);
template<typename eT> arma_cold inline static std::string gen_bin_header(const Cube<eT>&);
inline arma_cold static file_type guess_file_type_internal(std::istream& f);
arma_cold inline static file_type guess_file_type_internal(std::istream& f);
inline arma_cold static std::string gen_tmp_name(const std::string& x);
arma_cold inline static std::string gen_tmp_name(const std::string& x);
inline arma_cold static bool safe_rename(const std::string& old_name, const std::string& new_name);
arma_cold inline static bool safe_rename(const std::string& old_name, const std::string& new_name);
inline arma_cold static bool is_readable(const std::string& name);
arma_cold inline static bool is_readable(const std::string& name);
template<typename eT> inline static bool convert_token(eT& val, const std::string& token);
template<typename T> inline static bool convert_token(std::complex<T>& val, const std::string& token);
include/armadillo_bits/diskio_meat.hpp
-9
View File
@@ -27,7 +27,6 @@
//! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes.
template<typename eT>
inline
arma_cold
std::string
diskio::gen_txt_header(const Mat<eT>&)
{
@@ -77,7 +76,6 @@ diskio::gen_txt_header(const Mat<eT>&)
//! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes.
template<typename eT>
inline
arma_cold
std::string
diskio::gen_bin_header(const Mat<eT>&)
{
@@ -127,7 +125,6 @@ diskio::gen_bin_header(const Mat<eT>&)
//! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes.
template<typename eT>
inline
arma_cold
std::string
diskio::gen_bin_header(const SpMat<eT>&)
{
@@ -176,7 +173,6 @@ diskio::gen_bin_header(const SpMat<eT>&)
//! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes.
template<typename eT>
inline
arma_cold
std::string
diskio::gen_txt_header(const Cube<eT>&)
{
@@ -226,7 +222,6 @@ diskio::gen_txt_header(const Cube<eT>&)
//! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes.
template<typename eT>
inline
arma_cold
std::string
diskio::gen_bin_header(const Cube<eT>&)
{
@@ -281,7 +276,6 @@ diskio::guess_file_type(std::istream& f)
inline
arma_cold
file_type
diskio::guess_file_type_internal(std::istream& f)
{
@@ -356,7 +350,6 @@ diskio::guess_file_type_internal(std::istream& f)
//! Append a quasi-random string to the given filename.
//! Avoiding use of rand() to preserve its state.
inline
arma_cold
std::string
diskio::gen_tmp_name(const std::string& x)
{
@@ -393,7 +386,6 @@ diskio::gen_tmp_name(const std::string& x)
//! (i) overwriting files that are write protected,
//! (ii) overwriting directories.
inline
arma_cold
bool
diskio::safe_rename(const std::string& old_name, const std::string& new_name)
{
@@ -413,7 +405,6 @@ diskio::safe_rename(const std::string& old_name, const std::string& new_name)
inline
arma_cold
bool
diskio::is_readable(const std::string& name)
{
include/armadillo_bits/eglue_core_meat.hpp
-10
View File
@@ -255,7 +255,6 @@
template<typename eglue_type>
template<typename outT, typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply(outT& out, const eGlue<T1, T2, eglue_type>& x)
@@ -355,7 +354,6 @@ eglue_core<eglue_type>::apply(outT& out, const eGlue<T1, T2, eglue_type>& x)
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_plus(Mat<typename T1::elem_type>& out, const eGlue<T1, T2, eglue_type>& x)
@@ -453,7 +451,6 @@ eglue_core<eglue_type>::apply_inplace_plus(Mat<typename T1::elem_type>& out, con
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_minus(Mat<typename T1::elem_type>& out, const eGlue<T1, T2, eglue_type>& x)
@@ -551,7 +548,6 @@ eglue_core<eglue_type>::apply_inplace_minus(Mat<typename T1::elem_type>& out, co
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_schur(Mat<typename T1::elem_type>& out, const eGlue<T1, T2, eglue_type>& x)
@@ -649,7 +645,6 @@ eglue_core<eglue_type>::apply_inplace_schur(Mat<typename T1::elem_type>& out, co
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_div(Mat<typename T1::elem_type>& out, const eGlue<T1, T2, eglue_type>& x)
@@ -752,7 +747,6 @@ eglue_core<eglue_type>::apply_inplace_div(Mat<typename T1::elem_type>& out, cons
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply(Cube<typename T1::elem_type>& out, const eGlueCube<T1, T2, eglue_type>& x)
@@ -853,7 +847,6 @@ eglue_core<eglue_type>::apply(Cube<typename T1::elem_type>& out, const eGlueCube
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_plus(Cube<typename T1::elem_type>& out, const eGlueCube<T1, T2, eglue_type>& x)
@@ -952,7 +945,6 @@ eglue_core<eglue_type>::apply_inplace_plus(Cube<typename T1::elem_type>& out, co
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_minus(Cube<typename T1::elem_type>& out, const eGlueCube<T1, T2, eglue_type>& x)
@@ -1051,7 +1043,6 @@ eglue_core<eglue_type>::apply_inplace_minus(Cube<typename T1::elem_type>& out, c
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_schur(Cube<typename T1::elem_type>& out, const eGlueCube<T1, T2, eglue_type>& x)
@@ -1150,7 +1141,6 @@ eglue_core<eglue_type>::apply_inplace_schur(Cube<typename T1::elem_type>& out, c
template<typename eglue_type>
template<typename T1, typename T2>
arma_hot
inline
void
eglue_core<eglue_type>::apply_inplace_div(Cube<typename T1::elem_type>& out, const eGlueCube<T1, T2, eglue_type>& x)
include/armadillo_bits/eop_core_meat.hpp
+8 -10
View File
@@ -241,7 +241,6 @@
template<typename eop_type>
template<typename outT, typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply(outT& out, const eOp<T1, eop_type>& x)
@@ -317,7 +316,6 @@ eop_core<eop_type>::apply(outT& out, const eOp<T1, eop_type>& x)
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_plus(Mat<typename T1::elem_type>& out, const eOp<T1, eop_type>& x)
@@ -392,7 +390,7 @@ eop_core<eop_type>::apply_inplace_plus(Mat<typename T1::elem_type>& out, const e
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_minus(Mat<typename T1::elem_type>& out, const eOp<T1, eop_type>& x)
@@ -467,7 +465,7 @@ eop_core<eop_type>::apply_inplace_minus(Mat<typename T1::elem_type>& out, const
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_schur(Mat<typename T1::elem_type>& out, const eOp<T1, eop_type>& x)
@@ -542,7 +540,7 @@ eop_core<eop_type>::apply_inplace_schur(Mat<typename T1::elem_type>& out, const
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_div(Mat<typename T1::elem_type>& out, const eOp<T1, eop_type>& x)
@@ -622,7 +620,7 @@ eop_core<eop_type>::apply_inplace_div(Mat<typename T1::elem_type>& out, const eO
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply(Cube<typename T1::elem_type>& out, const eOpCube<T1, eop_type>& x)
@@ -699,7 +697,7 @@ eop_core<eop_type>::apply(Cube<typename T1::elem_type>& out, const eOpCube<T1, e
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_plus(Cube<typename T1::elem_type>& out, const eOpCube<T1, eop_type>& x)
@@ -775,7 +773,7 @@ eop_core<eop_type>::apply_inplace_plus(Cube<typename T1::elem_type>& out, const
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_minus(Cube<typename T1::elem_type>& out, const eOpCube<T1, eop_type>& x)
@@ -851,7 +849,7 @@ eop_core<eop_type>::apply_inplace_minus(Cube<typename T1::elem_type>& out, const
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_schur(Cube<typename T1::elem_type>& out, const eOpCube<T1, eop_type>& x)
@@ -927,7 +925,7 @@ eop_core<eop_type>::apply_inplace_schur(Cube<typename T1::elem_type>& out, const
template<typename eop_type>
template<typename T1>
arma_hot
inline
void
eop_core<eop_type>::apply_inplace_div(Cube<typename T1::elem_type>& out, const eOpCube<T1, eop_type>& x)
include/armadillo_bits/field_bones.hpp
+36 -36
View File
@@ -88,43 +88,43 @@ class field
template<typename oT2>
inline void copy_size(const field<oT2>& x);
arma_inline arma_warn_unused oT& operator[](const uword i);
arma_inline arma_warn_unused const oT& operator[](const uword i) const;
arma_warn_unused arma_inline oT& operator[](const uword i);
arma_warn_unused arma_inline const oT& operator[](const uword i) const;
arma_inline arma_warn_unused oT& at(const uword i);
arma_inline arma_warn_unused const oT& at(const uword i) const;
arma_warn_unused arma_inline oT& at(const uword i);
arma_warn_unused arma_inline const oT& at(const uword i) const;
arma_inline arma_warn_unused oT& operator()(const uword i);
arma_inline arma_warn_unused const oT& operator()(const uword i) const;
arma_warn_unused arma_inline oT& operator()(const uword i);
arma_warn_unused arma_inline const oT& operator()(const uword i) const;
#if defined(__cpp_multidimensional_subscript)
arma_inline arma_warn_unused oT& operator[](const uword row, const uword col);
arma_inline arma_warn_unused const oT& operator[](const uword row, const uword col) const;
arma_warn_unused arma_inline oT& operator[](const uword row, const uword col);
arma_warn_unused arma_inline const oT& operator[](const uword row, const uword col) const;
#endif
arma_inline arma_warn_unused oT& at(const uword row, const uword col);
arma_inline arma_warn_unused const oT& at(const uword row, const uword col) const;
arma_warn_unused arma_inline oT& at(const uword row, const uword col);
arma_warn_unused arma_inline const oT& at(const uword row, const uword col) const;
#if defined(__cpp_multidimensional_subscript)
arma_inline arma_warn_unused oT& operator[](const uword row, const uword col, const uword slice);
arma_inline arma_warn_unused const oT& operator[](const uword row, const uword col, const uword slice) const;
arma_warn_unused arma_inline oT& operator[](const uword row, const uword col, const uword slice);
arma_warn_unused arma_inline const oT& operator[](const uword row, const uword col, const uword slice) const;
#endif
arma_inline arma_warn_unused oT& at(const uword row, const uword col, const uword slice);
arma_inline arma_warn_unused const oT& at(const uword row, const uword col, const uword slice) const;
arma_warn_unused arma_inline oT& at(const uword row, const uword col, const uword slice);
arma_warn_unused arma_inline const oT& at(const uword row, const uword col, const uword slice) const;
arma_inline arma_warn_unused oT& operator()(const uword row, const uword col);
arma_inline arma_warn_unused const oT& operator()(const uword row, const uword col) const;
arma_warn_unused arma_inline oT& operator()(const uword row, const uword col);
arma_warn_unused arma_inline const oT& operator()(const uword row, const uword col) const;
arma_inline arma_warn_unused oT& operator()(const uword row, const uword col, const uword slice);
arma_inline arma_warn_unused const oT& operator()(const uword row, const uword col, const uword slice) const;
arma_warn_unused arma_inline oT& operator()(const uword row, const uword col, const uword slice);
arma_warn_unused arma_inline const oT& operator()(const uword row, const uword col, const uword slice) const;
arma_inline arma_warn_unused oT& front();
arma_inline arma_warn_unused const oT& front() const;
arma_warn_unused arma_inline oT& front();
arma_warn_unused arma_inline const oT& front() const;
arma_inline arma_warn_unused oT& back();
arma_inline arma_warn_unused const oT& back() const;
arma_warn_unused arma_inline oT& back();
arma_warn_unused arma_inline const oT& back() const;
arma_frown("use braced initialiser list instead") inline field_injector<field> operator<<(const oT& val);
@@ -194,27 +194,27 @@ class field
arma_inline bool is_empty() const;
arma_inline arma_warn_unused bool in_range(const uword i) const;
arma_inline arma_warn_unused bool in_range(const span& x) const;
arma_warn_unused arma_inline bool in_range(const uword i) const;
arma_warn_unused arma_inline bool in_range(const span& x) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col) const;
arma_inline arma_warn_unused bool in_range(const span& row_span, const uword in_col) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const span& col_span) const;
arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col) const;
arma_warn_unused arma_inline bool in_range(const span& row_span, const uword in_col) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const span& col_span) const;
arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice) const;
arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span, const span& slice_span) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const uword in_slice) const;
arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span, const span& slice_span) const;
arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const;
arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const;
inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const;
inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) const;
arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const;
arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const;
inline arma_cold bool load(const std::string name, const file_type type = auto_detect);
inline arma_cold bool load( std::istream& is, const file_type type = auto_detect);
arma_cold inline bool load(const std::string name, const file_type type = auto_detect);
arma_cold inline bool load( std::istream& is, const file_type type = auto_detect);
arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const;
include/armadillo_bits/field_meat.hpp
+4 -42
View File
@@ -474,7 +474,6 @@ field<oT>::copy_size(const field<oT2>& x)
//! linear element accessor (treats the field as a vector); no bounds check
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::operator[] (const uword i)
{
@@ -486,7 +485,6 @@ field<oT>::operator[] (const uword i)
//! linear element accessor (treats the field as a vector); no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::operator[] (const uword i) const
{
@@ -498,7 +496,6 @@ field<oT>::operator[] (const uword i) const
//! linear element accessor (treats the field as a vector); no bounds check
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::at(const uword i)
{
@@ -510,7 +507,6 @@ field<oT>::at(const uword i)
//! linear element accessor (treats the field as a vector); no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::at(const uword i) const
{
@@ -522,7 +518,6 @@ field<oT>::at(const uword i) const
//! linear element accessor (treats the field as a vector); bounds checking not done when ARMA_NO_DEBUG is defined
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::operator() (const uword i)
{
@@ -536,7 +531,6 @@ field<oT>::operator() (const uword i)
//! linear element accessor (treats the field as a vector); bounds checking not done when ARMA_NO_DEBUG is defined
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::operator() (const uword i) const
{
@@ -550,7 +544,6 @@ field<oT>::operator() (const uword i) const
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::operator() (const uword in_row, const uword in_col)
{
@@ -564,7 +557,6 @@ field<oT>::operator() (const uword in_row, const uword in_col)
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::operator() (const uword in_row, const uword in_col) const
{
@@ -578,7 +570,6 @@ field<oT>::operator() (const uword in_row, const uword in_col) const
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::operator() (const uword in_row, const uword in_col, const uword in_slice)
{
@@ -592,7 +583,6 @@ field<oT>::operator() (const uword in_row, const uword in_col, const uword in_sl
//! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined
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
{
@@ -608,8 +598,7 @@ field<oT>::operator() (const uword in_row, const uword in_col, const uword in_sl
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
oT&
oT&
field<oT>::operator[] (const uword in_row, const uword in_col)
{
return (*mem[in_row + in_col*n_rows]);
@@ -620,8 +609,7 @@ field<oT>::operator() (const uword in_row, const uword in_col, const uword in_sl
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
const oT&
field<oT>::operator[] (const uword in_row, const uword in_col) const
{
return (*mem[in_row + in_col*n_rows]);
@@ -634,7 +622,6 @@ field<oT>::operator() (const uword in_row, const uword in_col, const uword in_sl
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::at(const uword in_row, const uword in_col)
{
@@ -646,7 +633,6 @@ field<oT>::at(const uword in_row, const uword in_col)
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::at(const uword in_row, const uword in_col) const
{
@@ -660,8 +646,7 @@ field<oT>::at(const uword in_row, const uword in_col) const
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
oT&
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)]);
@@ -672,8 +657,7 @@ field<oT>::at(const uword in_row, const uword in_col) const
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
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)]);
@@ -686,7 +670,6 @@ field<oT>::at(const uword in_row, const uword in_col) const
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::at(const uword in_row, const uword in_col, const uword in_slice)
{
@@ -698,7 +681,6 @@ field<oT>::at(const uword in_row, const uword in_col, const uword in_slice)
//! element accessor; no bounds check
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::at(const uword in_row, const uword in_col, const uword in_slice) const
{
@@ -709,7 +691,6 @@ field<oT>::at(const uword in_row, const uword in_col, const uword in_slice) cons
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::front()
{
@@ -722,7 +703,6 @@ field<oT>::front()
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::front() const
{
@@ -735,7 +715,6 @@ field<oT>::front() const
template<typename oT>
arma_inline
arma_warn_unused
oT&
field<oT>::back()
{
@@ -748,7 +727,6 @@ field<oT>::back()
template<typename oT>
arma_inline
arma_warn_unused
const oT&
field<oT>::back() const
{
@@ -1483,7 +1461,6 @@ field<oT>::operator()(const uword in_row1, const uword in_col1, const uword in_s
//! has been defined.
template<typename oT>
arma_cold
inline
void
field<oT>::print(const std::string extra_text) const
@@ -1514,7 +1491,6 @@ field<oT>::print(const std::string extra_text) const
//! has been defined.
template<typename oT>
arma_cold
inline
void
field<oT>::print(std::ostream& user_stream, const std::string extra_text) const
@@ -1621,7 +1597,6 @@ field<oT>::is_empty() const
//! returns true if the given index is currently in range
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const uword i) const
{
@@ -1633,7 +1608,6 @@ field<oT>::in_range(const uword i) const
//! returns true if the given start and end indices are currently in range
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const span& x) const
{
@@ -1657,7 +1631,6 @@ field<oT>::in_range(const span& x) const
//! returns true if the given location is currently in range
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const uword in_row, const uword in_col) const
{
@@ -1668,7 +1641,6 @@ field<oT>::in_range(const uword in_row, const uword in_col) const
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const span& row_span, const uword in_col) const
{
@@ -1691,7 +1663,6 @@ field<oT>::in_range(const span& row_span, const uword in_col) const
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const uword in_row, const span& col_span) const
{
@@ -1714,7 +1685,6 @@ field<oT>::in_range(const uword in_row, const span& col_span) const
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const span& row_span, const span& col_span) const
{
@@ -1736,7 +1706,6 @@ field<oT>::in_range(const span& row_span, const span& col_span) const
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const uword in_row, const uword in_col, const SizeMat& s) const
{
@@ -1757,7 +1726,6 @@ field<oT>::in_range(const uword in_row, const uword in_col, const SizeMat& s) co
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const uword in_row, const uword in_col, const uword in_slice) const
{
@@ -1768,7 +1736,6 @@ field<oT>::in_range(const uword in_row, const uword in_col, const uword in_slice
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const span& row_span, const span& col_span, const span& slice_span) const
{
@@ -1794,7 +1761,6 @@ field<oT>::in_range(const span& row_span, const span& col_span, const span& slic
template<typename oT>
arma_inline
arma_warn_unused
bool
field<oT>::in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const
{
@@ -1816,7 +1782,6 @@ field<oT>::in_range(const uword in_row, const uword in_col, const uword in_slice
template<typename oT>
inline
arma_cold
bool
field<oT>::save(const std::string name, const file_type type) const
{
@@ -1845,7 +1810,6 @@ field<oT>::save(const std::string name, const file_type type) const
template<typename oT>
inline
arma_cold
bool
field<oT>::save(std::ostream& os, const file_type type) const
{
@@ -1874,7 +1838,6 @@ field<oT>::save(std::ostream& os, const file_type type) const
template<typename oT>
inline
arma_cold
bool
field<oT>::load(const std::string name, const file_type type)
{
@@ -1905,7 +1868,6 @@ field<oT>::load(const std::string name, const file_type type)
template<typename oT>
inline
arma_cold
bool
field<oT>::load(std::istream& is, const file_type type)
{
include/armadillo_bits/fn_log_det.hpp
+2 -2
View File
@@ -55,8 +55,8 @@ log_det
template<typename T1>
inline
arma_warn_unused
inline
std::complex<typename T1::pod_type>
log_det
(
@@ -124,8 +124,8 @@ log_det_sympd
template<typename T1>
inline
arma_warn_unused
inline
typename T1::pod_type
log_det_sympd
(
include/armadillo_bits/fn_log_normpdf.hpp
+6 -6
View File
@@ -92,8 +92,8 @@ log_normpdf_helper(Mat<typename T1::elem_type>& out, const Base<typename T1::ele
template<typename eT>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), eT >::result
log_normpdf(const eT x)
{
@@ -105,8 +105,8 @@ log_normpdf(const eT x)
template<typename eT>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), eT >::result
log_normpdf(const eT x, const eT mu, const eT sigma)
{
@@ -120,8 +120,8 @@ log_normpdf(const eT x, const eT mu, const eT sigma)
template<typename eT, typename T2, typename T3>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), Mat<eT> >::result
log_normpdf(const eT x, const Base<eT, T2>& M_expr, const Base<eT, T3>& S_expr)
{
@@ -140,8 +140,8 @@ log_normpdf(const eT x, const Base<eT, T2>& M_expr, const Base<eT, T3>& S_expr)
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
log_normpdf(const Base<typename T1::elem_type, T1>& X_expr)
{
@@ -162,8 +162,8 @@ log_normpdf(const Base<typename T1::elem_type, T1>& X_expr)
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
log_normpdf(const Base<typename T1::elem_type, T1>& X_expr, const typename T1::elem_type mu, const typename T1::elem_type sigma)
{
@@ -184,8 +184,8 @@ log_normpdf(const Base<typename T1::elem_type, T1>& X_expr, const typename T1::e
template<typename T1, typename T2, typename T3>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
log_normpdf(const Base<typename T1::elem_type, T1>& X_expr, const Base<typename T1::elem_type, T2>& M_expr, const Base<typename T1::elem_type, T3>& S_expr)
{
include/armadillo_bits/fn_norm.hpp
+6 -6
View File
@@ -22,8 +22,8 @@
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< is_arma_type<T1>::value, typename T1::pod_type >::result
norm
(
@@ -68,8 +68,8 @@ norm
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< is_arma_type<T1>::value, typename T1::pod_type >::result
norm
(
@@ -121,8 +121,8 @@ norm
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< is_arma_type<T1>::value, double >::result
norm
(
@@ -143,8 +143,8 @@ norm
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< is_arma_type<T1>::value, double >::result
norm
(
@@ -169,8 +169,8 @@ norm
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< is_arma_sparse_type<T1>::value, typename T1::pod_type >::result
norm
(
@@ -224,8 +224,8 @@ norm
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< is_arma_sparse_type<T1>::value, typename T1::pod_type >::result
norm
(
include/armadillo_bits/fn_normcdf.hpp
+6 -6
View File
@@ -88,8 +88,8 @@ normcdf_helper(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_ty
template<typename eT>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), eT >::result
normcdf(const eT x)
{
@@ -101,8 +101,8 @@ normcdf(const eT x)
template<typename eT>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), eT >::result
normcdf(const eT x, const eT mu, const eT sigma)
{
@@ -116,8 +116,8 @@ normcdf(const eT x, const eT mu, const eT sigma)
template<typename eT, typename T2, typename T3>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), Mat<eT> >::result
normcdf(const eT x, const Base<eT, T2>& M_expr, const Base<eT, T3>& S_expr)
{
@@ -136,8 +136,8 @@ normcdf(const eT x, const Base<eT, T2>& M_expr, const Base<eT, T3>& S_expr)
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
normcdf(const Base<typename T1::elem_type, T1>& X_expr)
{
@@ -158,8 +158,8 @@ normcdf(const Base<typename T1::elem_type, T1>& X_expr)
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
normcdf(const Base<typename T1::elem_type, T1>& X_expr, const typename T1::elem_type mu, const typename T1::elem_type sigma)
{
@@ -180,8 +180,8 @@ normcdf(const Base<typename T1::elem_type, T1>& X_expr, const typename T1::elem_
template<typename T1, typename T2, typename T3>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
normcdf(const Base<typename T1::elem_type, T1>& X_expr, const Base<typename T1::elem_type, T2>& M_expr, const Base<typename T1::elem_type, T3>& S_expr)
{
include/armadillo_bits/fn_normpdf.hpp
+6 -6
View File
@@ -92,8 +92,8 @@ normpdf_helper(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_ty
template<typename eT>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), eT >::result
normpdf(const eT x)
{
@@ -105,8 +105,8 @@ normpdf(const eT x)
template<typename eT>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), eT >::result
normpdf(const eT x, const eT mu, const eT sigma)
{
@@ -120,8 +120,8 @@ normpdf(const eT x, const eT mu, const eT sigma)
template<typename eT, typename T2, typename T3>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<eT>::value), Mat<eT> >::result
normpdf(const eT x, const Base<eT, T2>& M_expr, const Base<eT, T3>& S_expr)
{
@@ -140,8 +140,8 @@ normpdf(const eT x, const Base<eT, T2>& M_expr, const Base<eT, T3>& S_expr)
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
normpdf(const Base<typename T1::elem_type, T1>& X_expr)
{
@@ -162,8 +162,8 @@ normpdf(const Base<typename T1::elem_type, T1>& X_expr)
template<typename T1>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
normpdf(const Base<typename T1::elem_type, T1>& X_expr, const typename T1::elem_type mu, const typename T1::elem_type sigma)
{
@@ -184,8 +184,8 @@ normpdf(const Base<typename T1::elem_type, T1>& X_expr, const typename T1::elem_
template<typename T1, typename T2, typename T3>
inline
arma_warn_unused
inline
typename enable_if2< (is_real<typename T1::elem_type>::value), Mat<typename T1::elem_type> >::result
normpdf(const Base<typename T1::elem_type, T1>& X_expr, const Base<typename T1::elem_type, T2>& M_expr, const Base<typename T1::elem_type, T3>& S_expr)
{
include/armadillo_bits/glue_times_meat.hpp
-15
View File
@@ -23,7 +23,6 @@
template<bool do_inv_detect>
template<typename T1, typename T2>
arma_hot
inline
void
glue_times_redirect2_helper<do_inv_detect>::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_times>& X)
@@ -74,7 +73,6 @@ glue_times_redirect2_helper<do_inv_detect>::apply(Mat<typename T1::elem_type>& o
template<typename T1, typename T2>
arma_hot
inline
void
glue_times_redirect2_helper<true>::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_times>& X)
@@ -160,7 +158,6 @@ glue_times_redirect2_helper<true>::apply(Mat<typename T1::elem_type>& out, const
template<bool do_inv_detect>
template<typename T1, typename T2, typename T3>
arma_hot
inline
void
glue_times_redirect3_helper<do_inv_detect>::apply(Mat<typename T1::elem_type>& out, const Glue< Glue<T1,T2,glue_times>, T3, glue_times>& X)
@@ -218,7 +215,6 @@ glue_times_redirect3_helper<do_inv_detect>::apply(Mat<typename T1::elem_type>& o
template<typename T1, typename T2, typename T3>
arma_hot
inline
void
glue_times_redirect3_helper<true>::apply(Mat<typename T1::elem_type>& out, const Glue< Glue<T1,T2,glue_times>, T3, glue_times>& X)
@@ -340,7 +336,6 @@ glue_times_redirect3_helper<true>::apply(Mat<typename T1::elem_type>& out, const
template<uword N>
template<typename T1, typename T2>
arma_hot
inline
void
glue_times_redirect<N>::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_times>& X)
@@ -391,7 +386,6 @@ glue_times_redirect<N>::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2
template<typename T1, typename T2>
arma_hot
inline
void
glue_times_redirect<2>::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_times>& X)
@@ -406,7 +400,6 @@ glue_times_redirect<2>::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2
template<typename T1, typename T2, typename T3>
arma_hot
inline
void
glue_times_redirect<3>::apply(Mat<typename T1::elem_type>& out, const Glue< Glue<T1,T2,glue_times>, T3, glue_times>& X)
@@ -421,7 +414,6 @@ glue_times_redirect<3>::apply(Mat<typename T1::elem_type>& out, const Glue< Glue
template<typename T1, typename T2, typename T3, typename T4>
arma_hot
inline
void
glue_times_redirect<4>::apply(Mat<typename T1::elem_type>& out, const Glue< Glue< Glue<T1,T2,glue_times>, T3, glue_times>, T4, glue_times>& X)
@@ -483,7 +475,6 @@ glue_times_redirect<4>::apply(Mat<typename T1::elem_type>& out, const Glue< Glue
template<typename T1, typename T2>
arma_hot
inline
void
glue_times::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_times>& X)
@@ -500,7 +491,6 @@ glue_times::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_times>
template<typename T1>
arma_hot
inline
void
glue_times::apply_inplace(Mat<typename T1::elem_type>& out, const T1& X)
@@ -513,7 +503,6 @@ glue_times::apply_inplace(Mat<typename T1::elem_type>& out, const T1& X)
template<typename T1, typename T2>
arma_hot
inline
void
glue_times::apply_inplace_plus(Mat<typename T1::elem_type>& out, const Glue<T1, T2, glue_times>& X, const sword sign)
@@ -646,7 +635,6 @@ template
typename TA,
typename TB
>
arma_hot
inline
void
glue_times::apply
@@ -745,7 +733,6 @@ template
typename TB,
typename TC
>
arma_hot
inline
void
glue_times::apply
@@ -795,7 +782,6 @@ template
typename TC,
typename TD
>
arma_hot
inline
void
glue_times::apply
@@ -840,7 +826,6 @@ glue_times::apply
template<typename T1, typename T2>
arma_hot
inline
void
glue_times_diag::apply(Mat<typename T1::elem_type>& actual_out, const Glue<T1, T2, glue_times_diag>& X)
include/armadillo_bits/gmm_diag_meat.hpp
-2
View File
@@ -1052,7 +1052,6 @@ gmm_diag<eT>::internal_gen_boundaries(const uword N) const
template<typename eT>
arma_hot
inline
eT
gmm_diag<eT>::internal_scalar_log_p(const eT* x) const
@@ -1085,7 +1084,6 @@ gmm_diag<eT>::internal_scalar_log_p(const eT* x) const
template<typename eT>
arma_hot
inline
eT
gmm_diag<eT>::internal_scalar_log_p(const eT* x, const uword g) const
include/armadillo_bits/gmm_misc_meat.hpp
-1
View File
@@ -62,7 +62,6 @@ running_mean_scalar<eT>::operator=(const running_mean_scalar<eT>& in)
template<typename eT>
arma_hot
inline
void
running_mean_scalar<eT>::operator() (const eT X)
include/armadillo_bits/injector_meat.hpp
-19
View File
@@ -22,7 +22,6 @@
template<typename eT>
arma_cold
inline
mat_injector_row<eT>::mat_injector_row()
: n_cols(0)
@@ -35,7 +34,6 @@ mat_injector_row<eT>::mat_injector_row()
template<typename eT>
arma_cold
inline
void
mat_injector_row<eT>::insert(const eT val) const
@@ -70,7 +68,6 @@ mat_injector_row<eT>::insert(const eT val) const
template<typename T1>
arma_cold
inline
mat_injector<T1>::mat_injector(T1& in_X, const typename mat_injector<T1>::elem_type val)
: X(in_X)
@@ -98,7 +95,6 @@ mat_injector<T1>::mat_injector(T1& in_X, const typename mat_injector<T1>::elem_t
template<typename T1>
arma_cold
inline
mat_injector<T1>::mat_injector(T1& in_X, const injector_end_of_row<>& x)
: X(in_X)
@@ -127,7 +123,6 @@ mat_injector<T1>::mat_injector(T1& in_X, const injector_end_of_row<>& x)
template<typename T1>
arma_cold
inline
mat_injector<T1>::~mat_injector()
{
@@ -226,7 +221,6 @@ mat_injector<T1>::~mat_injector()
template<typename T1>
arma_cold
inline
void
mat_injector<T1>::insert(const typename mat_injector<T1>::elem_type val) const
@@ -244,7 +238,6 @@ mat_injector<T1>::insert(const typename mat_injector<T1>::elem_type val) const
template<typename T1>
arma_cold
inline
void
mat_injector<T1>::end_of_row() const
@@ -273,7 +266,6 @@ mat_injector<T1>::end_of_row() const
template<typename T1>
arma_cold
inline
const mat_injector<T1>&
operator<<(const mat_injector<T1>& ref, const typename mat_injector<T1>::elem_type val)
@@ -288,7 +280,6 @@ operator<<(const mat_injector<T1>& ref, const typename mat_injector<T1>::elem_ty
template<typename T1>
arma_cold
inline
const mat_injector<T1>&
operator<<(const mat_injector<T1>& ref, const injector_end_of_row<>& x)
@@ -345,7 +336,6 @@ operator<<(const mat_injector<T1>& ref, const injector_end_of_row<>& x)
template<typename oT>
arma_cold
inline
field_injector_row<oT>::field_injector_row()
: n_cols(0)
@@ -363,7 +353,6 @@ field_injector_row<oT>::field_injector_row()
template<typename oT>
arma_cold
inline
field_injector_row<oT>::~field_injector_row()
{
@@ -376,7 +365,6 @@ field_injector_row<oT>::~field_injector_row()
template<typename oT>
arma_cold
inline
void
field_injector_row<oT>::insert(const oT& val) const
@@ -415,7 +403,6 @@ field_injector_row<oT>::insert(const oT& val) const
template<typename T1>
arma_cold
inline
field_injector<T1>::field_injector(T1& in_X, const typename field_injector<T1>::object_type& val)
: X(in_X)
@@ -443,7 +430,6 @@ field_injector<T1>::field_injector(T1& in_X, const typename field_injector<T1>::
template<typename T1>
arma_cold
inline
field_injector<T1>::field_injector(T1& in_X, const injector_end_of_row<>& x)
: X(in_X)
@@ -472,7 +458,6 @@ field_injector<T1>::field_injector(T1& in_X, const injector_end_of_row<>& x)
template<typename T1>
arma_cold
inline
field_injector<T1>::~field_injector()
{
@@ -530,7 +515,6 @@ field_injector<T1>::~field_injector()
template<typename T1>
arma_cold
inline
void
field_injector<T1>::insert(const typename field_injector<T1>::object_type& val) const
@@ -548,7 +532,6 @@ field_injector<T1>::insert(const typename field_injector<T1>::object_type& val)
template<typename T1>
arma_cold
inline
void
field_injector<T1>::end_of_row() const
@@ -580,7 +563,6 @@ field_injector<T1>::end_of_row() const
template<typename T1>
arma_cold
inline
const field_injector<T1>&
operator<<(const field_injector<T1>& ref, const typename field_injector<T1>::object_type& val)
@@ -595,7 +577,6 @@ operator<<(const field_injector<T1>& ref, const typename field_injector<T1>::obj
template<typename T1>
arma_cold
inline
const field_injector<T1>&
operator<<(const field_injector<T1>& ref, const injector_end_of_row<>& x)
include/armadillo_bits/op_det_meat.hpp
-3
View File
@@ -137,7 +137,6 @@ op_det::apply_trimat(const Base<typename T1::elem_type,T1>& expr)
template<typename eT>
arma_cold
inline
eT
op_det::apply_tiny_2x2(const Mat<eT>& X)
@@ -152,7 +151,6 @@ op_det::apply_tiny_2x2(const Mat<eT>& X)
template<typename eT>
arma_cold
inline
eT
op_det::apply_tiny_3x3(const Mat<eT>& X)
@@ -179,7 +177,6 @@ op_det::apply_tiny_3x3(const Mat<eT>& X)
template<typename eT>
arma_cold
inline
eT
op_det::apply_tiny_4x4(const Mat<eT>& X)
include/armadillo_bits/op_dot_meat.hpp
-15
View File
@@ -67,7 +67,6 @@ op_dot::direct_dot_arma(const uword n_elem, const eT* const A, const eT* const B
//! for two arrays, generic version for complex values
template<typename eT>
arma_hot
inline
typename arma_cx_only<eT>::result
op_dot::direct_dot_arma(const uword n_elem, const eT* const A, const eT* const B)
@@ -101,7 +100,6 @@ op_dot::direct_dot_arma(const uword n_elem, const eT* const A, const eT* const B
//! for two arrays, float and double version
template<typename eT>
arma_hot
inline
typename arma_real_only<eT>::result
op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B)
@@ -139,7 +137,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B)
//! for two arrays, complex version
template<typename eT>
inline
arma_hot
typename arma_cx_only<eT>::result
op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B)
{
@@ -173,7 +170,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B)
//! for two arrays, integral version
template<typename eT>
arma_hot
inline
typename arma_integral_only<eT>::result
op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B)
@@ -186,7 +182,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B)
//! for three arrays
template<typename eT>
arma_hot
inline
eT
op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B, const eT* C)
@@ -206,7 +201,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B, con
template<typename T1, typename T2>
arma_hot
inline
typename T1::elem_type
op_dot::apply(const T1& X, const T2& Y)
@@ -266,7 +260,6 @@ op_dot::apply(const T1& X, const T2& Y)
template<typename T1, typename T2>
arma_hot
inline
typename arma_not_cx<typename T1::elem_type>::result
op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB)
@@ -304,7 +297,6 @@ op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB)
template<typename T1, typename T2>
arma_hot
inline
typename arma_cx_only<typename T1::elem_type>::result
op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB)
@@ -351,7 +343,6 @@ op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB)
template<typename T1, typename T2>
arma_hot
inline
typename T1::elem_type
op_norm_dot::apply(const T1& X, const T2& Y)
@@ -382,7 +373,6 @@ op_norm_dot::apply(const T1& X, const T2& Y)
template<typename eT>
arma_hot
inline
eT
op_cdot::direct_cdot_arma(const uword n_elem, const eT* const A, const eT* const B)
@@ -415,7 +405,6 @@ op_cdot::direct_cdot_arma(const uword n_elem, const eT* const A, const eT* const
template<typename eT>
arma_hot
inline
eT
op_cdot::direct_cdot(const uword n_elem, const eT* const A, const eT* const B)
@@ -462,7 +451,6 @@ op_cdot::direct_cdot(const uword n_elem, const eT* const A, const eT* const B)
template<typename T1, typename T2>
arma_hot
inline
typename T1::elem_type
op_cdot::apply(const T1& X, const T2& Y)
@@ -482,7 +470,6 @@ op_cdot::apply(const T1& X, const T2& Y)
template<typename T1, typename T2>
arma_hot
inline
typename T1::elem_type
op_cdot::apply_unwrap(const T1& X, const T2& Y)
@@ -505,7 +492,6 @@ op_cdot::apply_unwrap(const T1& X, const T2& Y)
template<typename T1, typename T2>
arma_hot
inline
typename T1::elem_type
op_cdot::apply_proxy(const T1& X, const T2& Y)
@@ -561,7 +547,6 @@ op_cdot::apply_proxy(const T1& X, const T2& Y)
template<typename T1, typename T2>
arma_hot
inline
typename promote_type<typename T1::elem_type, typename T2::elem_type>::result
op_dot_mixed::apply(const T1& A, const T2& B)
include/armadillo_bits/op_htrans_meat.hpp
-6
View File
@@ -22,7 +22,6 @@
template<typename eT>
arma_hot
inline
void
op_htrans::apply_mat_noalias(Mat<eT>& out, const Mat<eT>& A, const typename arma_not_cx<eT>::result* junk)
@@ -36,7 +35,6 @@ op_htrans::apply_mat_noalias(Mat<eT>& out, const Mat<eT>& A, const typename arma
template<typename eT>
arma_hot
inline
void
op_htrans::apply_mat_noalias(Mat<eT>& out, const Mat<eT>& A, const typename arma_cx_only<eT>::result* junk)
@@ -88,7 +86,6 @@ op_htrans::apply_mat_noalias(Mat<eT>& out, const Mat<eT>& A, const typename arma
template<typename T>
arma_hot
inline
void
op_htrans::block_worker(std::complex<T>* Y, const std::complex<T>* X, const uword X_n_rows, const uword Y_n_rows, const uword n_rows, const uword n_cols)
@@ -109,7 +106,6 @@ op_htrans::block_worker(std::complex<T>* Y, const std::complex<T>* X, const uwor
template<typename T>
arma_hot
inline
void
op_htrans::apply_mat_noalias_large(Mat< std::complex<T> >& out, const Mat< std::complex<T> >& A)
@@ -165,7 +161,6 @@ op_htrans::apply_mat_noalias_large(Mat< std::complex<T> >& out, const Mat< std::
template<typename eT>
arma_hot
inline
void
op_htrans::apply_mat_inplace(Mat<eT>& out, const typename arma_not_cx<eT>::result* junk)
@@ -179,7 +174,6 @@ op_htrans::apply_mat_inplace(Mat<eT>& out, const typename arma_not_cx<eT>::resul
template<typename eT>
arma_hot
inline
void
op_htrans::apply_mat_inplace(Mat<eT>& out, const typename arma_cx_only<eT>::result* junk)
include/armadillo_bits/op_inv_gen_meat.hpp
-3
View File
@@ -256,7 +256,6 @@ op_inv_gen_full::apply_direct(Mat<typename T1::elem_type>& out, const Base<typen
template<typename eT>
arma_cold
inline
bool
op_inv_gen_full::apply_tiny_2x2(Mat<eT>& X)
@@ -293,7 +292,6 @@ op_inv_gen_full::apply_tiny_2x2(Mat<eT>& X)
template<typename eT>
arma_cold
inline
bool
op_inv_gen_full::apply_tiny_3x3(Mat<eT>& X)
@@ -343,7 +341,6 @@ op_inv_gen_full::apply_tiny_3x3(Mat<eT>& X)
template<typename eT>
arma_cold
inline
bool
op_inv_gen_full::apply_tiny_4x4(Mat<eT>& X)
include/armadillo_bits/op_inv_spd_meat.hpp
-3
View File
@@ -237,7 +237,6 @@ op_inv_spd_full::apply_direct(Mat<typename T1::elem_type>& out, const Base<typen
template<typename eT>
arma_cold
inline
bool
op_inv_spd_full::apply_tiny_2x2(Mat<eT>& X)
@@ -285,7 +284,6 @@ op_inv_spd_full::apply_tiny_2x2(Mat<eT>& X)
template<typename eT>
arma_cold
inline
bool
op_inv_spd_full::apply_tiny_3x3(Mat<eT>& X)
@@ -316,7 +314,6 @@ op_inv_spd_full::apply_tiny_3x3(Mat<eT>& X)
template<typename eT>
arma_cold
inline
bool
op_inv_spd_full::apply_tiny_4x4(Mat<eT>& X)
include/armadillo_bits/op_mean_meat.hpp
-2
View File
@@ -136,7 +136,6 @@ op_mean::apply_noalias_unwrap(Mat<typename T1::elem_type>& out, const Proxy<T1>&
template<typename T1>
arma_hot
inline
void
op_mean::apply_noalias_proxy(Mat<typename T1::elem_type>& out, const Proxy<T1>& P, const uword dim)
@@ -365,7 +364,6 @@ op_mean::apply_noalias_unwrap(Cube<typename T1::elem_type>& out, const ProxyCube
template<typename T1>
arma_hot
inline
void
op_mean::apply_noalias_proxy(Cube<typename T1::elem_type>& out, const ProxyCube<T1>& P, const uword dim)
include/armadillo_bits/op_norm_meat.hpp
-12
View File
@@ -22,7 +22,6 @@
template<typename T1>
arma_hot
inline
typename T1::pod_type
op_norm::vec_norm_1(const Proxy<T1>& P, const typename arma_not_cx<typename T1::elem_type>::result* junk)
@@ -109,7 +108,6 @@ op_norm::vec_norm_1(const Proxy<T1>& P, const typename arma_not_cx<typename T1::
template<typename T1>
arma_hot
inline
typename T1::pod_type
op_norm::vec_norm_1(const Proxy<T1>& P, const typename arma_cx_only<typename T1::elem_type>::result* junk)
@@ -217,7 +215,6 @@ op_norm::vec_norm_1(const Proxy<T1>& P, const typename arma_cx_only<typename T1:
template<typename eT>
arma_hot
inline
eT
op_norm::vec_norm_1_direct_std(const Mat<eT>& X)
@@ -252,7 +249,6 @@ op_norm::vec_norm_1_direct_std(const Mat<eT>& X)
template<typename eT>
arma_hot
inline
eT
op_norm::vec_norm_1_direct_mem(const uword N, const eT* A)
@@ -305,7 +301,6 @@ op_norm::vec_norm_1_direct_mem(const uword N, const eT* A)
template<typename T1>
arma_hot
inline
typename T1::pod_type
op_norm::vec_norm_2(const Proxy<T1>& P, const typename arma_not_cx<typename T1::elem_type>::result* junk)
@@ -413,7 +408,6 @@ op_norm::vec_norm_2(const Proxy<T1>& P, const typename arma_not_cx<typename T1::
template<typename T1>
arma_hot
inline
typename T1::pod_type
op_norm::vec_norm_2(const Proxy<T1>& P, const typename arma_cx_only<typename T1::elem_type>::result* junk)
@@ -516,7 +510,6 @@ op_norm::vec_norm_2(const Proxy<T1>& P, const typename arma_cx_only<typename T1:
template<typename eT>
arma_hot
inline
eT
op_norm::vec_norm_2_direct_std(const Mat<eT>& X)
@@ -564,7 +557,6 @@ op_norm::vec_norm_2_direct_std(const Mat<eT>& X)
template<typename eT>
arma_hot
inline
eT
op_norm::vec_norm_2_direct_mem(const uword N, const eT* A)
@@ -623,7 +615,6 @@ op_norm::vec_norm_2_direct_mem(const uword N, const eT* A)
template<typename eT>
arma_hot
inline
eT
op_norm::vec_norm_2_direct_robust(const Mat<eT>& X)
@@ -688,7 +679,6 @@ op_norm::vec_norm_2_direct_robust(const Mat<eT>& X)
template<typename T1>
arma_hot
inline
typename T1::pod_type
op_norm::vec_norm_k(const Proxy<T1>& P, const int k)
@@ -738,7 +728,6 @@ op_norm::vec_norm_k(const Proxy<T1>& P, const int k)
template<typename T1>
arma_hot
inline
typename T1::pod_type
op_norm::vec_norm_max(const Proxy<T1>& P)
@@ -804,7 +793,6 @@ op_norm::vec_norm_max(const Proxy<T1>& P)
template<typename T1>
arma_hot
inline
typename T1::pod_type
op_norm::vec_norm_min(const Proxy<T1>& P)
include/armadillo_bits/op_strans_meat.hpp
-5
View File
@@ -23,7 +23,6 @@
//! for tiny square matrices (size <= 4x4)
template<typename eT, typename TA>
arma_cold
inline
void
op_strans::apply_mat_noalias_tinysq(Mat<eT>& out, const TA& A)
@@ -98,7 +97,6 @@ op_strans::apply_mat_noalias_tinysq(Mat<eT>& out, const TA& A)
template<typename eT>
arma_hot
inline
void
op_strans::block_worker(eT* Y, const eT* X, const uword X_n_rows, const uword Y_n_rows, const uword n_rows, const uword n_cols)
@@ -119,7 +117,6 @@ op_strans::block_worker(eT* Y, const eT* X, const uword X_n_rows, const uword Y_
template<typename eT>
arma_hot
inline
void
op_strans::apply_mat_noalias_large(Mat<eT>& out, const Mat<eT>& A)
@@ -176,7 +173,6 @@ op_strans::apply_mat_noalias_large(Mat<eT>& out, const Mat<eT>& A)
//! Immediate transpose of a dense matrix
template<typename eT, typename TA>
arma_hot
inline
void
op_strans::apply_mat_noalias(Mat<eT>& out, const TA& A)
@@ -233,7 +229,6 @@ op_strans::apply_mat_noalias(Mat<eT>& out, const TA& A)
template<typename eT>
arma_hot
inline
void
op_strans::apply_mat_inplace(Mat<eT>& out)
include/armadillo_bits/op_sum_meat.hpp
-8
View File
@@ -22,7 +22,6 @@
template<typename T1>
arma_hot
inline
void
op_sum::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_sum>& in)
@@ -53,7 +52,6 @@ op_sum::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_sum>& in)
template<typename T1>
arma_hot
inline
void
op_sum::apply_noalias(Mat<typename T1::elem_type>& out, const Proxy<T1>& P, const uword dim)
@@ -73,7 +71,6 @@ op_sum::apply_noalias(Mat<typename T1::elem_type>& out, const Proxy<T1>& P, cons
template<typename T1>
arma_hot
inline
void
op_sum::apply_noalias_unwrap(Mat<typename T1::elem_type>& out, const Proxy<T1>& P, const uword dim)
@@ -128,7 +125,6 @@ op_sum::apply_noalias_unwrap(Mat<typename T1::elem_type>& out, const Proxy<T1>&
template<typename T1>
arma_hot
inline
void
op_sum::apply_noalias_proxy(Mat<typename T1::elem_type>& out, const Proxy<T1>& P, const uword dim)
@@ -239,7 +235,6 @@ op_sum::apply_noalias_proxy(Mat<typename T1::elem_type>& out, const Proxy<T1>& P
template<typename T1>
arma_hot
inline
void
op_sum::apply(Cube<typename T1::elem_type>& out, const OpCube<T1,op_sum>& in)
@@ -270,7 +265,6 @@ op_sum::apply(Cube<typename T1::elem_type>& out, const OpCube<T1,op_sum>& in)
template<typename T1>
arma_hot
inline
void
op_sum::apply_noalias(Cube<typename T1::elem_type>& out, const ProxyCube<T1>& P, const uword dim)
@@ -290,7 +284,6 @@ op_sum::apply_noalias(Cube<typename T1::elem_type>& out, const ProxyCube<T1>& P,
template<typename T1>
arma_hot
inline
void
op_sum::apply_noalias_unwrap(Cube<typename T1::elem_type>& out, const ProxyCube<T1>& P, const uword dim)
@@ -355,7 +348,6 @@ op_sum::apply_noalias_unwrap(Cube<typename T1::elem_type>& out, const ProxyCube<
template<typename T1>
arma_hot
inline
void
op_sum::apply_noalias_proxy(Cube<typename T1::elem_type>& out, const ProxyCube<T1>& P, const uword dim)
include/armadillo_bits/podarray_meat.hpp
-2
View File
@@ -21,7 +21,6 @@
template<typename eT>
arma_hot
inline
podarray<eT>::~podarray()
{
@@ -84,7 +83,6 @@ podarray<eT>::operator=(const podarray& x)
template<typename eT>
arma_hot
arma_inline
podarray<eT>::podarray(const uword new_n_elem)
: n_elem(new_n_elem)
include/armadillo_bits/running_stat_vec_meat.hpp
-2
View File
@@ -84,7 +84,6 @@ running_stat_vec<obj_type>::operator=(const running_stat_vec<obj_type>& in_rsv)
//! update statistics to reflect new sample
template<typename obj_type>
template<typename T1>
arma_hot
inline
void
running_stat_vec<obj_type>::operator() (const Base<typename running_stat_vec<obj_type>::T, T1>& X)
@@ -112,7 +111,6 @@ running_stat_vec<obj_type>::operator() (const Base<typename running_stat_vec<obj
template<typename obj_type>
template<typename T1>
arma_hot
inline
void
running_stat_vec<obj_type>::operator() (const Base< std::complex<typename running_stat_vec<obj_type>::T>, T1>& X)
include/armadillo_bits/spglue_merge_meat.hpp
-4
View File
@@ -22,7 +22,6 @@
template<typename eT>
arma_hot
inline
void
spglue_merge::subview_merge(SpSubview<eT>& sv, const SpMat<eT>& B)
@@ -195,7 +194,6 @@ spglue_merge::subview_merge(SpSubview<eT>& sv, const SpMat<eT>& B)
template<typename eT>
arma_hot
inline
void
spglue_merge::subview_merge(SpSubview<eT>& sv, const Mat<eT>& B)
@@ -383,7 +381,6 @@ spglue_merge::subview_merge(SpSubview<eT>& sv, const Mat<eT>& B)
template<typename eT>
arma_hot
inline
void
spglue_merge::symmat_merge(SpMat<eT>& out, const SpMat<eT>& A, const SpMat<eT>& B)
@@ -468,7 +465,6 @@ spglue_merge::symmat_merge(SpMat<eT>& out, const SpMat<eT>& A, const SpMat<eT>&
template<typename eT>
arma_hot
inline
void
spglue_merge::diagview_merge(SpMat<eT>& out, const SpMat<eT>& A, const SpMat<eT>& B)
include/armadillo_bits/spglue_minus_meat.hpp
-3
View File
@@ -22,7 +22,6 @@
template<typename T1, typename T2>
arma_hot
inline
void
spglue_minus::apply(SpMat<typename T1::elem_type>& out, const SpGlue<T1,T2,spglue_minus>& X)
@@ -53,7 +52,6 @@ spglue_minus::apply(SpMat<typename T1::elem_type>& out, const SpGlue<T1,T2,spglu
template<typename eT, typename T1, typename T2>
arma_hot
inline
void
spglue_minus::apply_noalias(SpMat<eT>& out, const SpProxy<T1>& pa, const SpProxy<T2>& pb)
@@ -160,7 +158,6 @@ spglue_minus::apply_noalias(SpMat<eT>& out, const SpProxy<T1>& pa, const SpProxy
template<typename eT>
arma_hot
inline
void
spglue_minus::apply_noalias(SpMat<eT>& out, const SpMat<eT>& A, const SpMat<eT>& B)
include/armadillo_bits/spglue_plus_meat.hpp
-3
View File
@@ -22,7 +22,6 @@
template<typename T1, typename T2>
arma_hot
inline
void
spglue_plus::apply(SpMat<typename T1::elem_type>& out, const SpGlue<T1,T2,spglue_plus>& X)
@@ -53,7 +52,6 @@ spglue_plus::apply(SpMat<typename T1::elem_type>& out, const SpGlue<T1,T2,spglue
template<typename eT, typename T1, typename T2>
arma_hot
inline
void
spglue_plus::apply_noalias(SpMat<eT>& out, const SpProxy<T1>& pa, const SpProxy<T2>& pb)
@@ -160,7 +158,6 @@ spglue_plus::apply_noalias(SpMat<eT>& out, const SpProxy<T1>& pa, const SpProxy<
template<typename eT>
arma_hot
inline
void
spglue_plus::apply_noalias(SpMat<eT>& out, const SpMat<eT>& A, const SpMat<eT>& B)
include/armadillo_bits/spglue_schur_meat.hpp
-3
View File
@@ -22,7 +22,6 @@
template<typename T1, typename T2>
arma_hot
inline
void
spglue_schur::apply(SpMat<typename T1::elem_type>& out, const SpGlue<T1,T2,spglue_schur>& X)
@@ -53,7 +52,6 @@ spglue_schur::apply(SpMat<typename T1::elem_type>& out, const SpGlue<T1,T2,spglu
template<typename eT, typename T1, typename T2>
arma_hot
inline
void
spglue_schur::apply_noalias(SpMat<eT>& out, const SpProxy<T1>& pa, const SpProxy<T2>& pb)
@@ -150,7 +148,6 @@ spglue_schur::apply_noalias(SpMat<eT>& out, const SpProxy<T1>& pa, const SpProxy
template<typename eT>
arma_hot
inline
void
spglue_schur::apply_noalias(SpMat<eT>& out, const SpMat<eT>& A, const SpMat<eT>& B)
include/armadillo_bits/spglue_times_meat.hpp
-1
View File
@@ -84,7 +84,6 @@ spglue_times::apply(SpMat<typename T1::elem_type>& out, const SpGlue<SpOp<T1,spo
template<typename eT>
arma_hot
inline
void
spglue_times::apply_noalias(SpMat<eT>& c, const SpMat<eT>& x, const SpMat<eT>& y)
include/armadillo_bits/spop_sum_meat.hpp
-1
View File
@@ -22,7 +22,6 @@
template<typename T1>
arma_hot
inline
void
spop_sum::apply(SpMat<typename T1::elem_type>& out, const SpOp<T1,spop_sum>& in)
include/armadillo_bits/subview_bones.hpp
+73 -73
View File
@@ -119,25 +119,25 @@ class subview : public Base< eT, subview<eT> >
inline void randu();
inline void randn();
inline arma_warn_unused eT at_alt (const uword ii) const;
arma_warn_unused inline eT at_alt (const uword ii) const;
inline arma_warn_unused eT& operator[](const uword ii);
inline arma_warn_unused eT operator[](const uword ii) const;
arma_warn_unused inline eT& operator[](const uword ii);
arma_warn_unused inline eT operator[](const uword ii) const;
inline arma_warn_unused eT& operator()(const uword ii);
inline arma_warn_unused eT operator()(const uword ii) const;
arma_warn_unused inline eT& operator()(const uword ii);
arma_warn_unused inline eT operator()(const uword ii) const;
inline arma_warn_unused eT& operator()(const uword in_row, const uword in_col);
inline arma_warn_unused eT operator()(const uword in_row, const uword in_col) const;
arma_warn_unused inline eT& operator()(const uword in_row, const uword in_col);
arma_warn_unused inline eT operator()(const uword in_row, const uword in_col) const;
inline arma_warn_unused eT& at(const uword in_row, const uword in_col);
inline arma_warn_unused eT at(const uword in_row, const uword in_col) const;
arma_warn_unused inline eT& at(const uword in_row, const uword in_col);
arma_warn_unused inline eT at(const uword in_row, const uword in_col) const;
inline arma_warn_unused eT& front();
inline arma_warn_unused eT front() const;
arma_warn_unused inline eT& front();
arma_warn_unused inline eT front() const;
inline arma_warn_unused eT& back();
inline arma_warn_unused eT back() const;
arma_warn_unused inline eT& back();
arma_warn_unused inline eT back() const;
arma_inline eT* colptr(const uword in_col);
arma_inline const eT* colptr(const uword in_col) const;
@@ -145,12 +145,12 @@ class subview : public Base< eT, subview<eT> >
template<typename eT2>
inline bool check_overlap(const subview<eT2>& x) const;
inline arma_warn_unused bool is_vec() const;
inline arma_warn_unused bool is_finite() const;
inline arma_warn_unused bool is_zero(const pod_type tol = 0) const;
arma_warn_unused inline bool is_vec() const;
arma_warn_unused inline bool is_finite() const;
arma_warn_unused inline bool is_zero(const pod_type tol = 0) const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
inline subview_row<eT> row(const uword row_num);
inline const subview_row<eT> row(const uword row_num) const;
@@ -211,15 +211,15 @@ class subview : public Base< eT, subview<eT> >
inline iterator(const iterator& X);
inline iterator(subview<eT>& in_sv, const uword in_row, const uword in_col);
inline arma_warn_unused eT& operator*();
arma_warn_unused inline eT& operator*();
inline iterator& operator++();
inline arma_warn_unused iterator operator++(int);
inline iterator& operator++();
arma_warn_unused inline iterator operator++(int);
inline arma_warn_unused bool operator==(const iterator& rhs) const;
inline arma_warn_unused bool operator!=(const iterator& rhs) const;
inline arma_warn_unused bool operator==(const const_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const const_iterator& rhs) const;
arma_warn_unused inline bool operator==(const iterator& rhs) const;
arma_warn_unused inline bool operator!=(const iterator& rhs) const;
arma_warn_unused inline bool operator==(const const_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const const_iterator& rhs) const;
typedef std::forward_iterator_tag iterator_category;
typedef eT value_type;
@@ -246,15 +246,15 @@ class subview : public Base< eT, subview<eT> >
inline const_iterator(const const_iterator& X);
inline const_iterator(const subview<eT>& in_sv, const uword in_row, const uword in_col);
inline arma_warn_unused const eT& operator*();
arma_warn_unused inline const eT& operator*();
inline const_iterator& operator++();
inline arma_warn_unused const_iterator operator++(int);
inline const_iterator& operator++();
arma_warn_unused inline const_iterator operator++(int);
inline arma_warn_unused bool operator==(const iterator& rhs) const;
inline arma_warn_unused bool operator!=(const iterator& rhs) const;
inline arma_warn_unused bool operator==(const const_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const const_iterator& rhs) const;
arma_warn_unused inline bool operator==(const iterator& rhs) const;
arma_warn_unused inline bool operator!=(const iterator& rhs) const;
arma_warn_unused inline bool operator==(const const_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const const_iterator& rhs) const;
// So that we satisfy the STL iterator types.
typedef std::forward_iterator_tag iterator_category;
@@ -283,15 +283,15 @@ class subview : public Base< eT, subview<eT> >
inline row_iterator(const row_iterator& X);
inline row_iterator(subview<eT>& in_sv, const uword in_row, const uword in_col);
inline arma_warn_unused eT& operator* ();
arma_warn_unused inline eT& operator* ();
inline row_iterator& operator++();
inline arma_warn_unused row_iterator operator++(int);
inline row_iterator& operator++();
arma_warn_unused inline row_iterator operator++(int);
inline arma_warn_unused bool operator!=(const row_iterator& X) const;
inline arma_warn_unused bool operator==(const row_iterator& X) const;
inline arma_warn_unused bool operator!=(const const_row_iterator& X) const;
inline arma_warn_unused bool operator==(const const_row_iterator& X) const;
arma_warn_unused inline bool operator!=(const row_iterator& X) const;
arma_warn_unused inline bool operator==(const row_iterator& X) const;
arma_warn_unused inline bool operator!=(const const_row_iterator& X) const;
arma_warn_unused inline bool operator==(const const_row_iterator& X) const;
typedef std::forward_iterator_tag iterator_category;
typedef eT value_type;
@@ -317,15 +317,15 @@ class subview : public Base< eT, subview<eT> >
inline const_row_iterator(const const_row_iterator& X);
inline const_row_iterator(const subview<eT>& in_sv, const uword in_row, const uword in_col);
inline arma_warn_unused const eT& operator*() const;
arma_warn_unused inline const eT& operator*() const;
inline const_row_iterator& operator++();
inline arma_warn_unused const_row_iterator operator++(int);
inline const_row_iterator& operator++();
arma_warn_unused inline const_row_iterator operator++(int);
inline arma_warn_unused bool operator!=(const row_iterator& X) const;
inline arma_warn_unused bool operator==(const row_iterator& X) const;
inline arma_warn_unused bool operator!=(const const_row_iterator& X) const;
inline arma_warn_unused bool operator==(const const_row_iterator& X) const;
arma_warn_unused inline bool operator!=(const row_iterator& X) const;
arma_warn_unused inline bool operator==(const row_iterator& X) const;
arma_warn_unused inline bool operator!=(const const_row_iterator& X) const;
arma_warn_unused inline bool operator==(const const_row_iterator& X) const;
typedef std::forward_iterator_tag iterator_category;
typedef eT value_type;
@@ -382,11 +382,11 @@ class subview_col : public subview<eT>
template<typename T1, typename gen_type>
inline typename enable_if2< is_same_type<typename T1::elem_type, eT>::value, void>::result operator=(const Gen<T1,gen_type>& x);
arma_inline arma_warn_unused const Op<subview_col<eT>,op_htrans> t() const;
arma_inline arma_warn_unused const Op<subview_col<eT>,op_htrans> ht() const;
arma_inline arma_warn_unused const Op<subview_col<eT>,op_strans> st() const;
arma_warn_unused arma_inline const Op<subview_col<eT>,op_htrans> t() const;
arma_warn_unused arma_inline const Op<subview_col<eT>,op_htrans> ht() const;
arma_warn_unused arma_inline const Op<subview_col<eT>,op_strans> st() const;
arma_inline arma_warn_unused const Op<subview_col<eT>,op_strans> as_row() const;
arma_warn_unused arma_inline const Op<subview_col<eT>,op_strans> as_row() const;
inline void fill(const eT val);
inline void zeros();
@@ -424,14 +424,14 @@ class subview_col : public subview<eT>
inline subview_col<eT> tail(const uword N);
inline const subview_col<eT> tail(const uword N) const;
inline arma_warn_unused eT min() const;
inline arma_warn_unused eT max() const;
arma_warn_unused inline eT min() const;
arma_warn_unused inline eT max() const;
inline eT min(uword& index_of_min_val) const;
inline eT max(uword& index_of_max_val) const;
inline arma_warn_unused uword index_min() const;
inline arma_warn_unused uword index_max() const;
arma_warn_unused inline uword index_min() const;
arma_warn_unused inline uword index_max() const;
inline subview_col(const subview_col& in);
inline subview_col( subview_col&& in);
@@ -478,25 +478,25 @@ class subview_cols : public subview<eT>
template<typename T1, typename gen_type>
inline typename enable_if2< is_same_type<typename T1::elem_type, eT>::value, void>::result operator=(const Gen<T1,gen_type>& x);
arma_inline arma_warn_unused const Op<subview_cols<eT>,op_htrans> t() const;
arma_inline arma_warn_unused const Op<subview_cols<eT>,op_htrans> ht() const;
arma_inline arma_warn_unused const Op<subview_cols<eT>,op_strans> st() const;
arma_warn_unused arma_inline const Op<subview_cols<eT>,op_htrans> t() const;
arma_warn_unused arma_inline const Op<subview_cols<eT>,op_htrans> ht() const;
arma_warn_unused arma_inline const Op<subview_cols<eT>,op_strans> st() const;
arma_inline arma_warn_unused const Op<subview_cols<eT>,op_vectorise_col> as_col() const;
arma_warn_unused arma_inline const Op<subview_cols<eT>,op_vectorise_col> as_col() const;
inline arma_warn_unused eT at_alt (const uword ii) const;
arma_warn_unused inline eT at_alt (const uword ii) const;
inline arma_warn_unused eT& operator[](const uword ii);
inline arma_warn_unused eT operator[](const uword ii) const;
arma_warn_unused inline eT& operator[](const uword ii);
arma_warn_unused inline eT operator[](const uword ii) const;
inline arma_warn_unused eT& operator()(const uword ii);
inline arma_warn_unused eT operator()(const uword ii) const;
arma_warn_unused inline eT& operator()(const uword ii);
arma_warn_unused inline eT operator()(const uword ii) const;
inline arma_warn_unused eT& operator()(const uword in_row, const uword in_col);
inline arma_warn_unused eT operator()(const uword in_row, const uword in_col) const;
arma_warn_unused inline eT& operator()(const uword in_row, const uword in_col);
arma_warn_unused inline eT operator()(const uword in_row, const uword in_col) const;
inline arma_warn_unused eT& at(const uword in_row, const uword in_col);
inline arma_warn_unused eT at(const uword in_row, const uword in_col) const;
arma_warn_unused inline eT& at(const uword in_row, const uword in_col);
arma_warn_unused inline eT at(const uword in_row, const uword in_col) const;
arma_inline eT* colptr(const uword in_col);
arma_inline const eT* colptr(const uword in_col) const;
@@ -535,11 +535,11 @@ class subview_row : public subview<eT>
template<typename T1, typename gen_type>
inline typename enable_if2< is_same_type<typename T1::elem_type, eT>::value, void>::result operator=(const Gen<T1,gen_type>& x);
arma_inline arma_warn_unused const Op<subview_row<eT>,op_htrans> t() const;
arma_inline arma_warn_unused const Op<subview_row<eT>,op_htrans> ht() const;
arma_inline arma_warn_unused const Op<subview_row<eT>,op_strans> st() const;
arma_warn_unused arma_inline const Op<subview_row<eT>,op_htrans> t() const;
arma_warn_unused arma_inline const Op<subview_row<eT>,op_htrans> ht() const;
arma_warn_unused arma_inline const Op<subview_row<eT>,op_strans> st() const;
arma_inline arma_warn_unused const Op<subview_row<eT>,op_strans> as_col() const;
arma_warn_unused arma_inline const Op<subview_row<eT>,op_strans> as_col() const;
inline eT at_alt (const uword i) const;
@@ -570,8 +570,8 @@ class subview_row : public subview<eT>
inline subview_row<eT> tail(const uword N);
inline const subview_row<eT> tail(const uword N) const;
inline arma_warn_unused uword index_min() const;
inline arma_warn_unused uword index_max() const;
arma_warn_unused inline uword index_min() const;
arma_warn_unused inline uword index_max() const;
inline typename subview<eT>::row_iterator begin();
inline typename subview<eT>::const_row_iterator begin() const;
include/armadillo_bits/subview_cube_bones.hpp
+18 -18
View File
@@ -120,11 +120,11 @@ class subview_cube : public BaseCube< eT, subview_cube<eT> >
inline void randu();
inline void randn();
inline arma_warn_unused bool is_finite() const;
inline arma_warn_unused bool is_zero(const pod_type tol = 0) const;
arma_warn_unused inline bool is_finite() const;
arma_warn_unused inline bool is_zero(const pod_type tol = 0) const;
inline arma_warn_unused bool has_inf() const;
inline arma_warn_unused bool has_nan() const;
arma_warn_unused inline bool has_inf() const;
arma_warn_unused inline bool has_nan() const;
inline eT at_alt (const uword i) const;
@@ -159,15 +159,15 @@ class subview_cube : public BaseCube< eT, subview_cube<eT> >
inline iterator(const iterator& X);
inline iterator(subview_cube<eT>& in_sv, const uword in_row, const uword in_col, const uword in_slice);
inline arma_warn_unused eT& operator*();
arma_warn_unused inline eT& operator*();
inline iterator& operator++();
inline arma_warn_unused iterator operator++(int);
inline iterator& operator++();
arma_warn_unused inline iterator operator++(int);
inline arma_warn_unused bool operator==(const iterator& rhs) const;
inline arma_warn_unused bool operator!=(const iterator& rhs) const;
inline arma_warn_unused bool operator==(const const_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const const_iterator& rhs) const;
arma_warn_unused inline bool operator==(const iterator& rhs) const;
arma_warn_unused inline bool operator!=(const iterator& rhs) const;
arma_warn_unused inline bool operator==(const const_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const const_iterator& rhs) const;
typedef std::forward_iterator_tag iterator_category;
typedef eT value_type;
@@ -198,15 +198,15 @@ class subview_cube : public BaseCube< eT, subview_cube<eT> >
inline const_iterator(const const_iterator& X);
inline const_iterator(const subview_cube<eT>& in_sv, const uword in_row, const uword in_col, const uword in_slice);
inline arma_warn_unused const eT& operator*();
arma_warn_unused inline const eT& operator*();
inline const_iterator& operator++();
inline arma_warn_unused const_iterator operator++(int);
inline const_iterator& operator++();
arma_warn_unused inline const_iterator operator++(int);
inline arma_warn_unused bool operator==(const iterator& rhs) const;
inline arma_warn_unused bool operator!=(const iterator& rhs) const;
inline arma_warn_unused bool operator==(const const_iterator& rhs) const;
inline arma_warn_unused bool operator!=(const const_iterator& rhs) const;
arma_warn_unused inline bool operator==(const iterator& rhs) const;
arma_warn_unused inline bool operator!=(const iterator& rhs) const;
arma_warn_unused inline bool operator==(const const_iterator& rhs) const;
arma_warn_unused inline bool operator!=(const const_iterator& rhs) const;
// So that we satisfy the STL iterator types.
typedef std::forward_iterator_tag iterator_category;
include/armadillo_bits/subview_cube_each_meat.hpp
-1
View File
@@ -53,7 +53,6 @@ subview_cube_each_common<eT>::check_size(const Mat<eT2>& A) const
template<typename eT>
template<typename eT2>
arma_cold
inline
const std::string
subview_cube_each_common<eT>::incompat_size_string(const Mat<eT2>& A) const
include/armadillo_bits/subview_cube_meat.hpp
-16
View File
@@ -1341,7 +1341,6 @@ subview_cube<eT>::randn()
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::is_finite() const
{
@@ -1366,7 +1365,6 @@ subview_cube<eT>::is_finite() const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::is_zero(const typename get_pod_type<eT>::result tol) const
{
@@ -1391,7 +1389,6 @@ subview_cube<eT>::is_zero(const typename get_pod_type<eT>::result tol) const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::has_inf() const
{
@@ -1416,7 +1413,6 @@ subview_cube<eT>::has_inf() const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::has_nan() const
{
@@ -2426,7 +2422,6 @@ subview_cube<eT>::iterator::iterator(subview_cube<eT>& in_sv, const uword in_row
template<typename eT>
inline
arma_warn_unused
eT&
subview_cube<eT>::iterator::operator*()
{
@@ -2467,7 +2462,6 @@ subview_cube<eT>::iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename subview_cube<eT>::iterator
subview_cube<eT>::iterator::operator++(int)
{
@@ -2482,7 +2476,6 @@ subview_cube<eT>::iterator::operator++(int)
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::iterator::operator==(const iterator& rhs) const
{
@@ -2493,7 +2486,6 @@ subview_cube<eT>::iterator::operator==(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::iterator::operator!=(const iterator& rhs) const
{
@@ -2504,7 +2496,6 @@ subview_cube<eT>::iterator::operator!=(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::iterator::operator==(const const_iterator& rhs) const
{
@@ -2515,7 +2506,6 @@ subview_cube<eT>::iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::iterator::operator!=(const const_iterator& rhs) const
{
@@ -2605,7 +2595,6 @@ subview_cube<eT>::const_iterator::const_iterator(const subview_cube<eT>& in_sv,
template<typename eT>
inline
arma_warn_unused
const eT&
subview_cube<eT>::const_iterator::operator*()
{
@@ -2646,7 +2635,6 @@ subview_cube<eT>::const_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename subview_cube<eT>::const_iterator
subview_cube<eT>::const_iterator::operator++(int)
{
@@ -2661,7 +2649,6 @@ subview_cube<eT>::const_iterator::operator++(int)
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::const_iterator::operator==(const iterator& rhs) const
{
@@ -2672,7 +2659,6 @@ subview_cube<eT>::const_iterator::operator==(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::const_iterator::operator!=(const iterator& rhs) const
{
@@ -2683,7 +2669,6 @@ subview_cube<eT>::const_iterator::operator!=(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::const_iterator::operator==(const const_iterator& rhs) const
{
@@ -2694,7 +2679,6 @@ subview_cube<eT>::const_iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview_cube<eT>::const_iterator::operator!=(const const_iterator& rhs) const
{
include/armadillo_bits/subview_each_meat.hpp
-1
View File
@@ -93,7 +93,6 @@ subview_each_common<parent,mode>::check_size(const Mat<eT2>& A) const
template<typename parent, unsigned int mode>
template<typename eT2>
arma_cold
inline
const std::string
subview_each_common<parent,mode>::incompat_size_string(const Mat<eT2>& A) const
include/armadillo_bits/subview_meat.hpp
-69
View File
@@ -1234,7 +1234,6 @@ subview<eT>::randn()
template<typename eT>
inline
arma_warn_unused
eT
subview<eT>::at_alt(const uword ii) const
{
@@ -1245,7 +1244,6 @@ subview<eT>::at_alt(const uword ii) const
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::operator[](const uword ii)
{
@@ -1261,7 +1259,6 @@ subview<eT>::operator[](const uword ii)
template<typename eT>
inline
arma_warn_unused
eT
subview<eT>::operator[](const uword ii) const
{
@@ -1277,7 +1274,6 @@ subview<eT>::operator[](const uword ii) const
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::operator()(const uword ii)
{
@@ -1295,7 +1291,6 @@ subview<eT>::operator()(const uword ii)
template<typename eT>
inline
arma_warn_unused
eT
subview<eT>::operator()(const uword ii) const
{
@@ -1313,7 +1308,6 @@ subview<eT>::operator()(const uword ii) const
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::operator()(const uword in_row, const uword in_col)
{
@@ -1328,7 +1322,6 @@ subview<eT>::operator()(const uword in_row, const uword in_col)
template<typename eT>
inline
arma_warn_unused
eT
subview<eT>::operator()(const uword in_row, const uword in_col) const
{
@@ -1343,7 +1336,6 @@ subview<eT>::operator()(const uword in_row, const uword in_col) const
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::at(const uword in_row, const uword in_col)
{
@@ -1356,7 +1348,6 @@ subview<eT>::at(const uword in_row, const uword in_col)
template<typename eT>
inline
arma_warn_unused
eT
subview<eT>::at(const uword in_row, const uword in_col) const
{
@@ -1369,7 +1360,6 @@ subview<eT>::at(const uword in_row, const uword in_col) const
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::front()
{
@@ -1382,7 +1372,6 @@ subview<eT>::front()
template<typename eT>
inline
arma_warn_unused
eT
subview<eT>::front() const
{
@@ -1395,7 +1384,6 @@ subview<eT>::front() const
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::back()
{
@@ -1411,7 +1399,6 @@ subview<eT>::back()
template<typename eT>
inline
arma_warn_unused
eT
subview<eT>::back() const
{
@@ -1483,7 +1470,6 @@ subview<eT>::check_overlap(const subview<eT2>& x) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::is_vec() const
{
@@ -1494,7 +1480,6 @@ subview<eT>::is_vec() const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::is_finite() const
{
@@ -1515,7 +1500,6 @@ subview<eT>::is_finite() const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::is_zero(const typename get_pod_type<eT>::result tol) const
{
@@ -1536,7 +1520,6 @@ subview<eT>::is_zero(const typename get_pod_type<eT>::result tol) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::has_inf() const
{
@@ -1557,7 +1540,6 @@ subview<eT>::has_inf() const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::has_nan() const
{
@@ -2720,7 +2702,6 @@ subview<eT>::iterator::iterator(subview<eT>& in_sv, const uword in_row, const uw
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::iterator::operator*()
{
@@ -2755,7 +2736,6 @@ subview<eT>::iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename subview<eT>::iterator
subview<eT>::iterator::operator++(int)
{
@@ -2770,7 +2750,6 @@ subview<eT>::iterator::operator++(int)
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::iterator::operator==(const iterator& rhs) const
{
@@ -2781,7 +2760,6 @@ subview<eT>::iterator::operator==(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::iterator::operator!=(const iterator& rhs) const
{
@@ -2792,7 +2770,6 @@ subview<eT>::iterator::operator!=(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::iterator::operator==(const const_iterator& rhs) const
{
@@ -2803,7 +2780,6 @@ subview<eT>::iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::iterator::operator!=(const const_iterator& rhs) const
{
@@ -2881,7 +2857,6 @@ subview<eT>::const_iterator::const_iterator(const subview<eT>& in_sv, const uwor
template<typename eT>
inline
arma_warn_unused
const eT&
subview<eT>::const_iterator::operator*()
{
@@ -2916,7 +2891,6 @@ subview<eT>::const_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename subview<eT>::const_iterator
subview<eT>::const_iterator::operator++(int)
{
@@ -2931,7 +2905,6 @@ subview<eT>::const_iterator::operator++(int)
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_iterator::operator==(const iterator& rhs) const
{
@@ -2942,7 +2915,6 @@ subview<eT>::const_iterator::operator==(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_iterator::operator!=(const iterator& rhs) const
{
@@ -2953,7 +2925,6 @@ subview<eT>::const_iterator::operator!=(const iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_iterator::operator==(const const_iterator& rhs) const
{
@@ -2964,7 +2935,6 @@ subview<eT>::const_iterator::operator==(const const_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_iterator::operator!=(const const_iterator& rhs) const
{
@@ -3024,7 +2994,6 @@ subview<eT>::row_iterator::row_iterator(subview<eT>& in_sv, const uword in_row,
template<typename eT>
inline
arma_warn_unused
eT&
subview<eT>::row_iterator::operator*()
{
@@ -3053,7 +3022,6 @@ subview<eT>::row_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename subview<eT>::row_iterator
subview<eT>::row_iterator::operator++(int)
{
@@ -3068,7 +3036,6 @@ subview<eT>::row_iterator::operator++(int)
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::row_iterator::operator==(const row_iterator& rhs) const
{
@@ -3079,7 +3046,6 @@ subview<eT>::row_iterator::operator==(const row_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::row_iterator::operator!=(const row_iterator& rhs) const
{
@@ -3090,7 +3056,6 @@ subview<eT>::row_iterator::operator!=(const row_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::row_iterator::operator==(const const_row_iterator& rhs) const
{
@@ -3101,7 +3066,6 @@ subview<eT>::row_iterator::operator==(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::row_iterator::operator!=(const const_row_iterator& rhs) const
{
@@ -3175,7 +3139,6 @@ subview<eT>::const_row_iterator::const_row_iterator(const subview<eT>& in_sv, co
template<typename eT>
inline
arma_warn_unused
const eT&
subview<eT>::const_row_iterator::operator*() const
{
@@ -3204,7 +3167,6 @@ subview<eT>::const_row_iterator::operator++()
template<typename eT>
inline
arma_warn_unused
typename subview<eT>::const_row_iterator
subview<eT>::const_row_iterator::operator++(int)
{
@@ -3219,7 +3181,6 @@ subview<eT>::const_row_iterator::operator++(int)
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_row_iterator::operator==(const row_iterator& rhs) const
{
@@ -3230,7 +3191,6 @@ subview<eT>::const_row_iterator::operator==(const row_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_row_iterator::operator!=(const row_iterator& rhs) const
{
@@ -3241,7 +3201,6 @@ subview<eT>::const_row_iterator::operator!=(const row_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_row_iterator::operator==(const const_row_iterator& rhs) const
{
@@ -3252,7 +3211,6 @@ subview<eT>::const_row_iterator::operator==(const const_row_iterator& rhs) const
template<typename eT>
inline
arma_warn_unused
bool
subview<eT>::const_row_iterator::operator!=(const const_row_iterator& rhs) const
{
@@ -3413,7 +3371,6 @@ subview_col<eT>::operator= (const Gen<T1,gen_type>& in)
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_col<eT>,op_htrans>
subview_col<eT>::t() const
{
@@ -3424,7 +3381,6 @@ subview_col<eT>::t() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_col<eT>,op_htrans>
subview_col<eT>::ht() const
{
@@ -3435,7 +3391,6 @@ subview_col<eT>::ht() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_col<eT>,op_strans>
subview_col<eT>::st() const
{
@@ -3446,7 +3401,6 @@ subview_col<eT>::st() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_col<eT>,op_strans>
subview_col<eT>::as_row() const
{
@@ -3780,7 +3734,6 @@ subview_col<eT>::tail(const uword N) const
template<typename eT>
inline
arma_warn_unused
eT
subview_col<eT>::min() const
{
@@ -3800,7 +3753,6 @@ subview_col<eT>::min() const
template<typename eT>
inline
arma_warn_unused
eT
subview_col<eT>::max() const
{
@@ -3866,7 +3818,6 @@ subview_col<eT>::max(uword& index_of_max_val) const
template<typename eT>
inline
arma_warn_unused
uword
subview_col<eT>::index_min() const
{
@@ -3890,7 +3841,6 @@ subview_col<eT>::index_min() const
template<typename eT>
inline
arma_warn_unused
uword
subview_col<eT>::index_max() const
{
@@ -4048,7 +3998,6 @@ subview_cols<eT>::operator= (const Gen<T1,gen_type>& in)
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_cols<eT>,op_htrans>
subview_cols<eT>::t() const
{
@@ -4059,7 +4008,6 @@ subview_cols<eT>::t() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_cols<eT>,op_htrans>
subview_cols<eT>::ht() const
{
@@ -4070,7 +4018,6 @@ subview_cols<eT>::ht() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_cols<eT>,op_strans>
subview_cols<eT>::st() const
{
@@ -4081,7 +4028,6 @@ subview_cols<eT>::st() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_cols<eT>,op_vectorise_col>
subview_cols<eT>::as_col() const
{
@@ -4092,7 +4038,6 @@ subview_cols<eT>::as_col() const
template<typename eT>
inline
arma_warn_unused
eT
subview_cols<eT>::at_alt(const uword ii) const
{
@@ -4103,7 +4048,6 @@ subview_cols<eT>::at_alt(const uword ii) const
template<typename eT>
inline
arma_warn_unused
eT&
subview_cols<eT>::operator[](const uword ii)
{
@@ -4116,7 +4060,6 @@ subview_cols<eT>::operator[](const uword ii)
template<typename eT>
inline
arma_warn_unused
eT
subview_cols<eT>::operator[](const uword ii) const
{
@@ -4129,7 +4072,6 @@ subview_cols<eT>::operator[](const uword ii) const
template<typename eT>
inline
arma_warn_unused
eT&
subview_cols<eT>::operator()(const uword ii)
{
@@ -4144,7 +4086,6 @@ subview_cols<eT>::operator()(const uword ii)
template<typename eT>
inline
arma_warn_unused
eT
subview_cols<eT>::operator()(const uword ii) const
{
@@ -4159,7 +4100,6 @@ subview_cols<eT>::operator()(const uword ii) const
template<typename eT>
inline
arma_warn_unused
eT&
subview_cols<eT>::operator()(const uword in_row, const uword in_col)
{
@@ -4174,7 +4114,6 @@ subview_cols<eT>::operator()(const uword in_row, const uword in_col)
template<typename eT>
inline
arma_warn_unused
eT
subview_cols<eT>::operator()(const uword in_row, const uword in_col) const
{
@@ -4189,7 +4128,6 @@ subview_cols<eT>::operator()(const uword in_row, const uword in_col) const
template<typename eT>
inline
arma_warn_unused
eT&
subview_cols<eT>::at(const uword in_row, const uword in_col)
{
@@ -4202,7 +4140,6 @@ subview_cols<eT>::at(const uword in_row, const uword in_col)
template<typename eT>
inline
arma_warn_unused
eT
subview_cols<eT>::at(const uword in_row, const uword in_col) const
{
@@ -4380,7 +4317,6 @@ subview_row<eT>::operator= (const Gen<T1,gen_type>& in)
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_row<eT>,op_htrans>
subview_row<eT>::t() const
{
@@ -4391,7 +4327,6 @@ subview_row<eT>::t() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_row<eT>,op_htrans>
subview_row<eT>::ht() const
{
@@ -4402,7 +4337,6 @@ subview_row<eT>::ht() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_row<eT>,op_strans>
subview_row<eT>::st() const
{
@@ -4413,7 +4347,6 @@ subview_row<eT>::st() const
template<typename eT>
arma_inline
arma_warn_unused
const Op<subview_row<eT>,op_strans>
subview_row<eT>::as_col() const
{
@@ -4708,7 +4641,6 @@ subview_row<eT>::tail(const uword N) const
template<typename eT>
inline
arma_warn_unused
uword
subview_row<eT>::index_min() const
{
@@ -4732,7 +4664,6 @@ subview_row<eT>::index_min() const
template<typename eT>
inline
arma_warn_unused
uword
subview_row<eT>::index_max() const
{
include/armadillo_bits/wall_clock_bones.hpp
+2 -2
View File
@@ -28,8 +28,8 @@ class wall_clock
inline wall_clock();
inline ~wall_clock();
inline void tic(); //!< start the timer
inline arma_warn_unused double toc(); //!< return the number of seconds since the last call to tic()
inline void tic(); //!< start the timer
arma_warn_unused inline double toc(); //!< return the number of seconds since the last call to tic()
private: