Skip to content

Commit ecbd7d2

Browse files
eddelbuetteleddelbuettel
committed
Another Armadillo 14.0.0 rc update
1 parent 0d4ec88 commit ecbd7d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1512
-497
lines changed

‎DESCRIPTION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RcppArmadillo
22
Type: Package
33
Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
4-
Version: 0.12.8.4.0.14.0
5-
Date: 2024-06-10
4+
Version: 0.12.8.4.0.14.3
5+
Date: 2024-06-21
66
Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson
77
Maintainer: Dirk Eddelbuettel <[email protected]>
88
Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad

‎inst/include/armadillo‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ namespace arma
375375
#include "armadillo_bits/spop_vectorise_bones.hpp"
376376
#include "armadillo_bits/spop_norm_bones.hpp"
377377
#include "armadillo_bits/spop_shift_bones.hpp"
378+
#include "armadillo_bits/spop_relational_bones.hpp"
378379

379380
#include "armadillo_bits/spglue_plus_bones.hpp"
380381
#include "armadillo_bits/spglue_minus_bones.hpp"
@@ -828,6 +829,7 @@ namespace arma
828829
#include "armadillo_bits/spop_vectorise_meat.hpp"
829830
#include "armadillo_bits/spop_norm_meat.hpp"
830831
#include "armadillo_bits/spop_shift_meat.hpp"
832+
#include "armadillo_bits/spop_relational_meat.hpp"
831833

832834
#include "armadillo_bits/spglue_plus_meat.hpp"
833835
#include "armadillo_bits/spglue_minus_meat.hpp"

‎inst/include/armadillo_bits/BaseCube_meat.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ BaseCube<elem_type,derived>::is_finite() const
308308
{
309309
arma_debug_sigprint();
310310

311-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
311+
if(arma_config::fast_math_warn) { arma_warn(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
312312

313313
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
314314
{
@@ -344,7 +344,7 @@ BaseCube<elem_type,derived>::has_inf() const
344344
{
345345
arma_debug_sigprint();
346346

347-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
347+
if(arma_config::fast_math_warn) { arma_warn(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
348348

349349
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
350350
{
@@ -380,7 +380,7 @@ BaseCube<elem_type,derived>::has_nan() const
380380
{
381381
arma_debug_sigprint();
382382

383-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
383+
if(arma_config::fast_math_warn) { arma_warn(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
384384

385385
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
386386
{
@@ -416,7 +416,7 @@ BaseCube<elem_type,derived>::has_nonfinite() const
416416
{
417417
arma_debug_sigprint();
418418

419-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
419+
if(arma_config::fast_math_warn) { arma_warn(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
420420

421421
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
422422
{

‎inst/include/armadillo_bits/Base_meat.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ Base<elem_type,derived>::is_finite() const
665665
{
666666
arma_debug_sigprint();
667667

668-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
668+
if(arma_config::fast_math_warn) { arma_warn(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
669669

670670
if(is_Mat<typename Proxy<derived>::stored_type>::value)
671671
{
@@ -713,7 +713,7 @@ Base<elem_type,derived>::has_inf() const
713713
{
714714
arma_debug_sigprint();
715715

716-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
716+
if(arma_config::fast_math_warn) { arma_warn(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
717717

718718
if(is_Mat<typename Proxy<derived>::stored_type>::value)
719719
{
@@ -761,7 +761,7 @@ Base<elem_type,derived>::has_nan() const
761761
{
762762
arma_debug_sigprint();
763763

764-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
764+
if(arma_config::fast_math_warn) { arma_warn(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
765765

766766
if(is_Mat<typename Proxy<derived>::stored_type>::value)
767767
{
@@ -809,7 +809,7 @@ Base<elem_type,derived>::has_nonfinite() const
809809
{
810810
arma_debug_sigprint();
811811

812-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
812+
if(arma_config::fast_math_warn) { arma_warn(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
813813

814814
if(is_Mat<typename Proxy<derived>::stored_type>::value)
815815
{

‎inst/include/armadillo_bits/Cube_meat.hpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4574,11 +4574,11 @@ Cube<eT>::save(const std::string name, const file_type type) const
45744574
break;
45754575

45764576
default:
4577-
arma_conform_warn(1, "Cube::save(): unsupported file type");
4577+
arma_warn(1, "Cube::save(): unsupported file type");
45784578
save_okay = false;
45794579
}
45804580

4581-
if(save_okay == false) { arma_conform_warn(3, "Cube::save(): write failed; file: ", name); }
4581+
if(save_okay == false) { arma_warn(3, "Cube::save(): write failed; file: ", name); }
45824582

45834583
return save_okay;
45844584
}
@@ -4630,11 +4630,11 @@ Cube<eT>::save(const hdf5_name& spec, const file_type type) const
46304630
{
46314631
if(err_msg.length() > 0)
46324632
{
4633-
arma_conform_warn(3, "Cube::save(): ", err_msg, "; file: ", spec.filename);
4633+
arma_warn(3, "Cube::save(): ", err_msg, "; file: ", spec.filename);
46344634
}
46354635
else
46364636
{
4637-
arma_conform_warn(3, "Cube::save(): write failed; file: ", spec.filename);
4637+
arma_warn(3, "Cube::save(): write failed; file: ", spec.filename);
46384638
}
46394639
}
46404640

@@ -4676,11 +4676,11 @@ Cube<eT>::save(std::ostream& os, const file_type type) const
46764676
break;
46774677

46784678
default:
4679-
arma_conform_warn(1, "Cube::save(): unsupported file type");
4679+
arma_warn(1, "Cube::save(): unsupported file type");
46804680
save_okay = false;
46814681
}
46824682

4683-
if(save_okay == false) { arma_conform_warn(3, "Cube::save(): stream write failed"); }
4683+
if(save_okay == false) { arma_warn(3, "Cube::save(): stream write failed"); }
46844684

46854685
return save_okay;
46864686
}
@@ -4733,7 +4733,7 @@ Cube<eT>::load(const std::string name, const file_type type)
47334733
break;
47344734

47354735
default:
4736-
arma_conform_warn(1, "Cube::load(): unsupported file type");
4736+
arma_warn(1, "Cube::load(): unsupported file type");
47374737
load_okay = false;
47384738
}
47394739

@@ -4743,11 +4743,11 @@ Cube<eT>::load(const std::string name, const file_type type)
47434743

47444744
if(err_msg.length() > 0)
47454745
{
4746-
arma_conform_warn(3, "Cube::load(): ", err_msg, "; file: ", name);
4746+
arma_warn(3, "Cube::load(): ", err_msg, "; file: ", name);
47474747
}
47484748
else
47494749
{
4750-
arma_conform_warn(3, "Cube::load(): read failed; file: ", name);
4750+
arma_warn(3, "Cube::load(): read failed; file: ", name);
47514751
}
47524752
}
47534753

@@ -4794,11 +4794,11 @@ Cube<eT>::load(const hdf5_name& spec, const file_type type)
47944794

47954795
if(err_msg.length() > 0)
47964796
{
4797-
arma_conform_warn(3, "Cube::load(): ", err_msg, "; file: ", spec.filename);
4797+
arma_warn(3, "Cube::load(): ", err_msg, "; file: ", spec.filename);
47984798
}
47994799
else
48004800
{
4801-
arma_conform_warn(3, "Cube::load(): read failed; file: ", spec.filename);
4801+
arma_warn(3, "Cube::load(): read failed; file: ", spec.filename);
48024802
}
48034803
}
48044804

@@ -4845,7 +4845,7 @@ Cube<eT>::load(std::istream& is, const file_type type)
48454845
break;
48464846

48474847
default:
4848-
arma_conform_warn(1, "Cube::load(): unsupported file type");
4848+
arma_warn(1, "Cube::load(): unsupported file type");
48494849
load_okay = false;
48504850
}
48514851

@@ -4855,11 +4855,11 @@ Cube<eT>::load(std::istream& is, const file_type type)
48554855

48564856
if(err_msg.length() > 0)
48574857
{
4858-
arma_conform_warn(3, "Cube::load(): ", err_msg);
4858+
arma_warn(3, "Cube::load(): ", err_msg);
48594859
}
48604860
else
48614861
{
4862-
arma_conform_warn(3, "Cube::load(): stream read failed");
4862+
arma_warn(3, "Cube::load(): stream read failed");
48634863
}
48644864
}
48654865

‎inst/include/armadillo_bits/Mat_meat.hpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7891,11 +7891,11 @@ Mat<eT>::save(const std::string name, const file_type type) const
78917891
break;
78927892

78937893
default:
7894-
arma_conform_warn(1, "Mat::save(): unsupported file type");
7894+
arma_warn(1, "Mat::save(): unsupported file type");
78957895
save_okay = false;
78967896
}
78977897

7898-
if(save_okay == false) { arma_conform_warn(3, "Mat::save(): write failed; file: ", name); }
7898+
if(save_okay == false) { arma_warn(3, "Mat::save(): write failed; file: ", name); }
78997899

79007900
return save_okay;
79017901
}
@@ -7948,11 +7948,11 @@ Mat<eT>::save(const hdf5_name& spec, const file_type type) const
79487948
{
79497949
if(err_msg.length() > 0)
79507950
{
7951-
arma_conform_warn(3, "Mat::save(): ", err_msg, "; file: ", spec.filename);
7951+
arma_warn(3, "Mat::save(): ", err_msg, "; file: ", spec.filename);
79527952
}
79537953
else
79547954
{
7955-
arma_conform_warn(3, "Mat::save(): write failed; file: ", spec.filename);
7955+
arma_warn(3, "Mat::save(): write failed; file: ", spec.filename);
79567956
}
79577957
}
79587958

@@ -7992,7 +7992,7 @@ Mat<eT>::save(const csv_name& spec, const file_type type) const
79927992
{
79937993
if( (spec.header_ro.n_cols != 1) && (spec.header_ro.n_rows != 1) )
79947994
{
7995-
arma_conform_warn(1, "Mat::save(): given header must have a vector layout");
7995+
arma_warn(1, "Mat::save(): given header must have a vector layout");
79967996
return false;
79977997
}
79987998

@@ -8002,7 +8002,7 @@ Mat<eT>::save(const csv_name& spec, const file_type type) const
80028002

80038003
if(token.find(separator) != std::string::npos)
80048004
{
8005-
arma_conform_warn(1, "Mat::save(): token within the header contains the separator character: '", token, "'");
8005+
arma_warn(1, "Mat::save(): token within the header contains the separator character: '", token, "'");
80068006
return false;
80078007
}
80088008
}
@@ -8011,7 +8011,7 @@ Mat<eT>::save(const csv_name& spec, const file_type type) const
80118011

80128012
if(spec.header_ro.n_elem != save_n_cols)
80138013
{
8014-
arma_conform_warn(1, "Mat::save(): size mismatch between header and matrix");
8014+
arma_warn(1, "Mat::save(): size mismatch between header and matrix");
80158015
return false;
80168016
}
80178017
}
@@ -8029,7 +8029,7 @@ Mat<eT>::save(const csv_name& spec, const file_type type) const
80298029
save_okay = diskio::save_csv_ascii(*this, spec.filename, spec.header_ro, with_header, separator);
80308030
}
80318031

8032-
if(save_okay == false) { arma_conform_warn(3, "Mat::save(): write failed; file: ", spec.filename); }
8032+
if(save_okay == false) { arma_warn(3, "Mat::save(): write failed; file: ", spec.filename); }
80338033

80348034
return save_okay;
80358035
}
@@ -8081,11 +8081,11 @@ Mat<eT>::save(std::ostream& os, const file_type type) const
80818081
break;
80828082

80838083
default:
8084-
arma_conform_warn(1, "Mat::save(): unsupported file type");
8084+
arma_warn(1, "Mat::save(): unsupported file type");
80858085
save_okay = false;
80868086
}
80878087

8088-
if(save_okay == false) { arma_conform_warn(3, "Mat::save(): stream write failed"); }
8088+
if(save_okay == false) { arma_warn(3, "Mat::save(): stream write failed"); }
80898089

80908090
return save_okay;
80918091
}
@@ -8150,19 +8150,19 @@ Mat<eT>::load(const std::string name, const file_type type)
81508150
break;
81518151

81528152
default:
8153-
arma_conform_warn(1, "Mat::load(): unsupported file type");
8153+
arma_warn(1, "Mat::load(): unsupported file type");
81548154
load_okay = false;
81558155
}
81568156

81578157
if(load_okay == false)
81588158
{
81598159
if(err_msg.length() > 0)
81608160
{
8161-
arma_conform_warn(3, "Mat::load(): ", err_msg, "; file: ", name);
8161+
arma_warn(3, "Mat::load(): ", err_msg, "; file: ", name);
81628162
}
81638163
else
81648164
{
8165-
arma_conform_warn(3, "Mat::load(): read failed; file: ", name);
8165+
arma_warn(3, "Mat::load(): read failed; file: ", name);
81668166
}
81678167
}
81688168

@@ -8209,11 +8209,11 @@ Mat<eT>::load(const hdf5_name& spec, const file_type type)
82098209
{
82108210
if(err_msg.length() > 0)
82118211
{
8212-
arma_conform_warn(3, "Mat::load(): ", err_msg, "; file: ", spec.filename);
8212+
arma_warn(3, "Mat::load(): ", err_msg, "; file: ", spec.filename);
82138213
}
82148214
else
82158215
{
8216-
arma_conform_warn(3, "Mat::load(): read failed; file: ", spec.filename);
8216+
arma_warn(3, "Mat::load(): read failed; file: ", spec.filename);
82178217
}
82188218
}
82198219

@@ -8282,11 +8282,11 @@ Mat<eT>::load(const csv_name& spec, const file_type type)
82828282
{
82838283
if(err_msg.length() > 0)
82848284
{
8285-
arma_conform_warn(3, "Mat::load(): ", err_msg, "; file: ", spec.filename);
8285+
arma_warn(3, "Mat::load(): ", err_msg, "; file: ", spec.filename);
82868286
}
82878287
else
82888288
{
8289-
arma_conform_warn(3, "Mat::load(): read failed; file: ", spec.filename);
8289+
arma_warn(3, "Mat::load(): read failed; file: ", spec.filename);
82908290
}
82918291
}
82928292
else
@@ -8295,7 +8295,7 @@ Mat<eT>::load(const csv_name& spec, const file_type type)
82958295

82968296
if(with_header && (spec.header_rw.n_elem != load_n_cols))
82978297
{
8298-
arma_conform_warn(3, "Mat::load(): size mismatch between header and matrix");
8298+
arma_warn(3, "Mat::load(): size mismatch between header and matrix");
82998299
}
83008300
}
83018301

@@ -8361,19 +8361,19 @@ Mat<eT>::load(std::istream& is, const file_type type)
83618361
break;
83628362

83638363
default:
8364-
arma_conform_warn(1, "Mat::load(): unsupported file type");
8364+
arma_warn(1, "Mat::load(): unsupported file type");
83658365
load_okay = false;
83668366
}
83678367

83688368
if(load_okay == false)
83698369
{
83708370
if(err_msg.length() > 0)
83718371
{
8372-
arma_conform_warn(3, "Mat::load(): ", err_msg);
8372+
arma_warn(3, "Mat::load(): ", err_msg);
83738373
}
83748374
else
83758375
{
8376-
arma_conform_warn(3, "Mat::load(): stream read failed");
8376+
arma_warn(3, "Mat::load(): stream read failed");
83778377
}
83788378
}
83798379

‎inst/include/armadillo_bits/SpBase_meat.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ SpBase<elem_type,derived>::is_finite() const
731731
{
732732
arma_debug_sigprint();
733733

734-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
734+
if(arma_config::fast_math_warn) { arma_warn(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
735735

736736
if(is_SpMat<typename SpProxy<derived>::stored_type>::value)
737737
{
@@ -765,7 +765,7 @@ SpBase<elem_type,derived>::has_inf() const
765765
{
766766
arma_debug_sigprint();
767767

768-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
768+
if(arma_config::fast_math_warn) { arma_warn(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
769769

770770
if(is_SpMat<typename SpProxy<derived>::stored_type>::value)
771771
{
@@ -799,7 +799,7 @@ SpBase<elem_type,derived>::has_nan() const
799799
{
800800
arma_debug_sigprint();
801801

802-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
802+
if(arma_config::fast_math_warn) { arma_warn(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
803803

804804
if(is_SpMat<typename SpProxy<derived>::stored_type>::value)
805805
{
@@ -833,7 +833,7 @@ SpBase<elem_type,derived>::has_nonfinite() const
833833
{
834834
arma_debug_sigprint();
835835

836-
if(arma_config::fast_math_warn) { arma_conform_warn(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
836+
if(arma_config::fast_math_warn) { arma_warn(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
837837

838838
if(is_SpMat<typename SpProxy<derived>::stored_type>::value)
839839
{

0 commit comments

Comments
 (0)