Skip to content

Commit e9d7600

Browse files
committed
Armadillo 14.2.0rc from git
1 parent bb5aab7 commit e9d7600

31 files changed

+777
-547
lines changed

inst/include/armadillo_bits/Base_bones.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ struct Base
127127
arma_warn_unused inline elem_type min() const;
128128
arma_warn_unused inline elem_type max() const;
129129

130-
inline elem_type min(uword& index_of_min_val) const;
131-
inline elem_type max(uword& index_of_max_val) const;
130+
arma_frown("use .index_min() instead") inline elem_type min(uword& index_of_min_val) const;
131+
arma_frown("use .index_max() instead") inline elem_type max(uword& index_of_max_val) const;
132132

133-
inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
134-
inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
133+
arma_deprecated inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
134+
arma_deprecated inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
135135

136136
arma_warn_unused inline uword index_min() const;
137137
arma_warn_unused inline uword index_max() const;

inst/include/armadillo_bits/Cube_bones.hpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,11 @@ class Cube : public BaseCube< eT, Cube<eT> >
387387
arma_warn_unused inline eT min() const;
388388
arma_warn_unused inline eT max() const;
389389

390-
inline eT min(uword& index_of_min_val) const;
391-
inline eT max(uword& index_of_max_val) const;
392-
393-
inline eT min(uword& row_of_min_val, uword& col_of_min_val, uword& slice_of_min_val) const;
394-
inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const;
390+
arma_frown("use .index_min() instead") inline eT min(uword& index_of_min_val) const;
391+
arma_frown("use .index_max() instead") inline eT max(uword& index_of_max_val) const;
395392

393+
arma_deprecated inline eT min(uword& row_of_min_val, uword& col_of_min_val, uword& slice_of_min_val) const;
394+
arma_deprecated inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const;
396395

397396
arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const;
398397
arma_cold inline bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const;

inst/include/armadillo_bits/Mat_bones.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,11 @@ class Mat : public Base< eT, Mat<eT> >
541541
arma_warn_unused inline eT min() const;
542542
arma_warn_unused inline eT max() const;
543543

544-
inline eT min(uword& index_of_min_val) const;
545-
inline eT max(uword& index_of_max_val) const;
544+
arma_frown("use .index_min() instead") inline eT min(uword& index_of_min_val) const;
545+
arma_frown("use .index_max() instead") inline eT max(uword& index_of_max_val) const;
546546

547-
inline eT min(uword& row_of_min_val, uword& col_of_min_val) const;
548-
inline eT max(uword& row_of_max_val, uword& col_of_max_val) const;
547+
arma_deprecated inline eT min(uword& row_of_min_val, uword& col_of_min_val) const;
548+
arma_deprecated inline eT max(uword& row_of_max_val, uword& col_of_max_val) const;
549549

550550

551551
arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const;

inst/include/armadillo_bits/SpBase_bones.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ struct SpBase
7676
arma_warn_unused inline elem_type min() const;
7777
arma_warn_unused inline elem_type max() const;
7878

79-
inline elem_type min(uword& index_of_min_val) const;
80-
inline elem_type max(uword& index_of_max_val) const;
79+
arma_frown("use .index_min() instead") inline elem_type min(uword& index_of_min_val) const;
80+
arma_frown("use .index_max() instead") inline elem_type max(uword& index_of_max_val) const;
8181

82-
inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
83-
inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
82+
arma_deprecated inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
83+
arma_deprecated inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
8484

8585
arma_warn_unused inline uword index_min() const;
8686
arma_warn_unused inline uword index_max() const;

inst/include/armadillo_bits/arma_version.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323

2424
#define ARMA_VERSION_MAJOR 14
25-
#define ARMA_VERSION_MINOR 0
26-
#define ARMA_VERSION_PATCH 2
27-
#define ARMA_VERSION_NAME "Stochastic Parrot"
25+
#define ARMA_VERSION_MINOR 1
26+
#define ARMA_VERSION_PATCH 90
27+
#define ARMA_VERSION_NAME "unstable"
2828

2929

3030

inst/include/armadillo_bits/auxlib_bones.hpp

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,29 @@ class auxlib
4343
template<typename eT>
4444
inline static bool inv_tr_rcond(Mat<eT>& A, typename get_pod_type<eT>::result& out_rcond, const uword layout);
4545

46+
template<typename eT>
47+
inline static bool inv_sym(Mat<eT>& A);
48+
49+
template<typename T>
50+
inline static bool inv_sym(Mat< std::complex<T> >& A);
51+
52+
template<typename eT>
53+
inline static bool inv_sym_rcond(Mat<eT>& A, eT& out_rcond);
54+
55+
template<typename T>
56+
inline static bool inv_sym_rcond(Mat< std::complex<T> >& A, T& out_rcond);
57+
4658
template<typename eT>
4759
inline static bool inv_sympd(Mat<eT>& A, bool& out_sympd_state);
4860

4961
template<typename eT>
5062
inline static bool inv_sympd(Mat<eT>& out, const Mat<eT>& X);
5163

5264
template<typename eT>
53-
inline static bool inv_sympd_rcond(Mat<eT>& A, bool& out_sympd_state, eT& out_rcond);
65+
inline static bool inv_sympd_rcond(Mat<eT>& A, eT& out_rcond);
5466

5567
template<typename T>
56-
inline static bool inv_sympd_rcond(Mat< std::complex<T> >& A, bool& out_sympd_state, T& out_rcond);
68+
inline static bool inv_sympd_rcond(Mat< std::complex<T> >& A, T& out_rcond);
5769

5870

5971
//
@@ -388,10 +400,10 @@ class auxlib
388400
inline static T rcond(Mat< std::complex<T> >& A);
389401

390402
template<typename eT>
391-
inline static eT rcond_sympd(Mat<eT>& A, bool& calc_ok);
403+
inline static eT rcond_sym(Mat<eT>& A);
392404

393-
template<typename T>
394-
inline static T rcond_sympd(Mat< std::complex<T> >& A, bool& calc_ok);
405+
template<typename T>
406+
inline static T rcond_sym(Mat< std::complex<T> >& A);
395407

396408
template<typename eT>
397409
inline static eT rcond_trimat(const Mat<eT>& A, const uword layout);

0 commit comments

Comments
 (0)