Skip to content

Commit adc4991

Browse files
eddelbuetteleddelbuettel
committed
Initial test of draft for 14.0.0
1 parent 37461ba commit adc4991

File tree

396 files changed

+8889
-8066
lines changed

Some content is hidden

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

396 files changed

+8889
-8066
lines changed

‎inst/include/armadillo‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ namespace arma
221221
#include "armadillo_bits/OpCube_bones.hpp"
222222
#include "armadillo_bits/SpOp_bones.hpp"
223223
#include "armadillo_bits/SpToDOp_bones.hpp"
224+
#include "armadillo_bits/mtSpToDOp_bones.hpp"
224225

225226
#include "armadillo_bits/eOp_bones.hpp"
226227
#include "armadillo_bits/eOpCube_bones.hpp"
@@ -316,6 +317,14 @@ namespace arma
316317
#include "armadillo_bits/op_rcond_bones.hpp"
317318
#include "armadillo_bits/op_sp_plus_bones.hpp"
318319
#include "armadillo_bits/op_sp_minus_bones.hpp"
320+
#include "armadillo_bits/op_sp_sum_bones.hpp"
321+
#include "armadillo_bits/op_sp_max_bones.hpp"
322+
#include "armadillo_bits/op_sp_min_bones.hpp"
323+
#include "armadillo_bits/op_sp_mean_bones.hpp"
324+
#include "armadillo_bits/op_sp_var_bones.hpp"
325+
#include "armadillo_bits/op_sp_stddev_bones.hpp"
326+
#include "armadillo_bits/op_sp_vecnorm_bones.hpp"
327+
#include "armadillo_bits/op_sp_diagvec_bones.hpp"
319328
#include "armadillo_bits/op_powmat_bones.hpp"
320329
#include "armadillo_bits/op_rank_bones.hpp"
321330
#include "armadillo_bits/op_row_as_mat_bones.hpp"
@@ -352,23 +361,17 @@ namespace arma
352361
#include "armadillo_bits/gmm_diag_bones.hpp"
353362
#include "armadillo_bits/gmm_full_bones.hpp"
354363

355-
#include "armadillo_bits/spop_max_bones.hpp"
356-
#include "armadillo_bits/spop_min_bones.hpp"
357-
#include "armadillo_bits/spop_sum_bones.hpp"
358364
#include "armadillo_bits/spop_strans_bones.hpp"
359365
#include "armadillo_bits/spop_htrans_bones.hpp"
360366
#include "armadillo_bits/spop_misc_bones.hpp"
361367
#include "armadillo_bits/spop_diagmat_bones.hpp"
362-
#include "armadillo_bits/spop_mean_bones.hpp"
363-
#include "armadillo_bits/spop_var_bones.hpp"
364368
#include "armadillo_bits/spop_trimat_bones.hpp"
365369
#include "armadillo_bits/spop_symmat_bones.hpp"
366370
#include "armadillo_bits/spop_normalise_bones.hpp"
367371
#include "armadillo_bits/spop_reverse_bones.hpp"
368372
#include "armadillo_bits/spop_repmat_bones.hpp"
369373
#include "armadillo_bits/spop_vectorise_bones.hpp"
370374
#include "armadillo_bits/spop_norm_bones.hpp"
371-
#include "armadillo_bits/spop_vecnorm_bones.hpp"
372375
#include "armadillo_bits/spop_shift_bones.hpp"
373376

374377
#include "armadillo_bits/spglue_plus_bones.hpp"
@@ -620,6 +623,7 @@ namespace arma
620623
#include "armadillo_bits/OpCube_meat.hpp"
621624
#include "armadillo_bits/SpOp_meat.hpp"
622625
#include "armadillo_bits/SpToDOp_meat.hpp"
626+
#include "armadillo_bits/mtSpToDOp_meat.hpp"
623627

624628
#include "armadillo_bits/mtOp_meat.hpp"
625629
#include "armadillo_bits/mtOpCube_meat.hpp"
@@ -764,6 +768,14 @@ namespace arma
764768
#include "armadillo_bits/op_rcond_meat.hpp"
765769
#include "armadillo_bits/op_sp_plus_meat.hpp"
766770
#include "armadillo_bits/op_sp_minus_meat.hpp"
771+
#include "armadillo_bits/op_sp_sum_meat.hpp"
772+
#include "armadillo_bits/op_sp_max_meat.hpp"
773+
#include "armadillo_bits/op_sp_min_meat.hpp"
774+
#include "armadillo_bits/op_sp_mean_meat.hpp"
775+
#include "armadillo_bits/op_sp_var_meat.hpp"
776+
#include "armadillo_bits/op_sp_stddev_meat.hpp"
777+
#include "armadillo_bits/op_sp_vecnorm_meat.hpp"
778+
#include "armadillo_bits/op_sp_diagvec_meat.hpp"
767779
#include "armadillo_bits/op_powmat_meat.hpp"
768780
#include "armadillo_bits/op_rank_meat.hpp"
769781
#include "armadillo_bits/op_row_as_mat_meat.hpp"
@@ -800,23 +812,17 @@ namespace arma
800812
#include "armadillo_bits/gmm_diag_meat.hpp"
801813
#include "armadillo_bits/gmm_full_meat.hpp"
802814

803-
#include "armadillo_bits/spop_max_meat.hpp"
804-
#include "armadillo_bits/spop_min_meat.hpp"
805-
#include "armadillo_bits/spop_sum_meat.hpp"
806815
#include "armadillo_bits/spop_strans_meat.hpp"
807816
#include "armadillo_bits/spop_htrans_meat.hpp"
808817
#include "armadillo_bits/spop_misc_meat.hpp"
809818
#include "armadillo_bits/spop_diagmat_meat.hpp"
810-
#include "armadillo_bits/spop_mean_meat.hpp"
811-
#include "armadillo_bits/spop_var_meat.hpp"
812819
#include "armadillo_bits/spop_trimat_meat.hpp"
813820
#include "armadillo_bits/spop_symmat_meat.hpp"
814821
#include "armadillo_bits/spop_normalise_meat.hpp"
815822
#include "armadillo_bits/spop_reverse_meat.hpp"
816823
#include "armadillo_bits/spop_repmat_meat.hpp"
817824
#include "armadillo_bits/spop_vectorise_meat.hpp"
818825
#include "armadillo_bits/spop_norm_meat.hpp"
819-
#include "armadillo_bits/spop_vecnorm_meat.hpp"
820826
#include "armadillo_bits/spop_shift_meat.hpp"
821827

822828
#include "armadillo_bits/spglue_plus_meat.hpp"

‎inst/include/armadillo_bits/BaseCube_meat.hpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ inline
3636
void
3737
BaseCube<elem_type,derived>::print(const std::string extra_text) const
3838
{
39-
arma_extra_debug_sigprint();
39+
arma_debug_sigprint();
4040

4141
const unwrap_cube<derived> tmp( (*this).get_ref() );
4242

@@ -59,7 +59,7 @@ inline
5959
void
6060
BaseCube<elem_type,derived>::print(std::ostream& user_stream, const std::string extra_text) const
6161
{
62-
arma_extra_debug_sigprint();
62+
arma_debug_sigprint();
6363

6464
const unwrap_cube<derived> tmp( (*this).get_ref() );
6565

@@ -82,7 +82,7 @@ inline
8282
void
8383
BaseCube<elem_type,derived>::raw_print(const std::string extra_text) const
8484
{
85-
arma_extra_debug_sigprint();
85+
arma_debug_sigprint();
8686

8787
const unwrap_cube<derived> tmp( (*this).get_ref() );
8888

@@ -105,7 +105,7 @@ inline
105105
void
106106
BaseCube<elem_type,derived>::raw_print(std::ostream& user_stream, const std::string extra_text) const
107107
{
108-
arma_extra_debug_sigprint();
108+
arma_debug_sigprint();
109109

110110
const unwrap_cube<derived> tmp( (*this).get_ref() );
111111

@@ -128,7 +128,7 @@ inline
128128
void
129129
BaseCube<elem_type,derived>::brief_print(const std::string extra_text) const
130130
{
131-
arma_extra_debug_sigprint();
131+
arma_debug_sigprint();
132132

133133
const unwrap_cube<derived> tmp( (*this).get_ref() );
134134

@@ -151,7 +151,7 @@ inline
151151
void
152152
BaseCube<elem_type,derived>::brief_print(std::ostream& user_stream, const std::string extra_text) const
153153
{
154-
arma_extra_debug_sigprint();
154+
arma_debug_sigprint();
155155

156156
const unwrap_cube<derived> tmp( (*this).get_ref() );
157157

@@ -200,7 +200,7 @@ BaseCube<elem_type,derived>::index_min() const
200200

201201
if(P.get_n_elem() == 0)
202202
{
203-
arma_debug_check(true, "index_min(): object has no elements");
203+
arma_conform_check(true, "index_min(): object has no elements");
204204
}
205205
else
206206
{
@@ -223,7 +223,7 @@ BaseCube<elem_type,derived>::index_max() const
223223

224224
if(P.get_n_elem() == 0)
225225
{
226-
arma_debug_check(true, "index_max(): object has no elements");
226+
arma_conform_check(true, "index_max(): object has no elements");
227227
}
228228
else
229229
{
@@ -240,11 +240,11 @@ inline
240240
bool
241241
BaseCube<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::result tol) const
242242
{
243-
arma_extra_debug_sigprint();
243+
arma_debug_sigprint();
244244

245245
typedef typename get_pod_type<elem_type>::result T;
246246

247-
arma_debug_check( (tol < T(0)), "is_zero(): parameter 'tol' must be >= 0" );
247+
arma_conform_check( (tol < T(0)), "is_zero(): parameter 'tol' must be >= 0" );
248248

249249
if(ProxyCube<derived>::use_at || is_Cube<typename ProxyCube<derived>::stored_type>::value)
250250
{
@@ -292,7 +292,7 @@ inline
292292
bool
293293
BaseCube<elem_type,derived>::is_empty() const
294294
{
295-
arma_extra_debug_sigprint();
295+
arma_debug_sigprint();
296296

297297
const ProxyCube<derived> P( (*this).get_ref() );
298298

@@ -306,9 +306,9 @@ inline
306306
bool
307307
BaseCube<elem_type,derived>::is_finite() const
308308
{
309-
arma_extra_debug_sigprint();
309+
arma_debug_sigprint();
310310

311-
if(arma_config::fast_math_warn) { arma_debug_warn_level(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
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"); }
312312

313313
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
314314
{
@@ -342,9 +342,9 @@ inline
342342
bool
343343
BaseCube<elem_type,derived>::has_inf() const
344344
{
345-
arma_extra_debug_sigprint();
345+
arma_debug_sigprint();
346346

347-
if(arma_config::fast_math_warn) { arma_debug_warn_level(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
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"); }
348348

349349
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
350350
{
@@ -378,9 +378,9 @@ inline
378378
bool
379379
BaseCube<elem_type,derived>::has_nan() const
380380
{
381-
arma_extra_debug_sigprint();
381+
arma_debug_sigprint();
382382

383-
if(arma_config::fast_math_warn) { arma_debug_warn_level(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
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"); }
384384

385385
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
386386
{
@@ -414,9 +414,9 @@ inline
414414
bool
415415
BaseCube<elem_type,derived>::has_nonfinite() const
416416
{
417-
arma_extra_debug_sigprint();
417+
arma_debug_sigprint();
418418

419-
if(arma_config::fast_math_warn) { arma_debug_warn_level(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
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"); }
420420

421421
if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
422422
{
@@ -473,7 +473,7 @@ arma_inline
473473
const derived&
474474
BaseCube_eval_Cube<elem_type, derived>::eval() const
475475
{
476-
arma_extra_debug_sigprint();
476+
arma_debug_sigprint();
477477

478478
return static_cast<const derived&>(*this);
479479
}
@@ -488,7 +488,7 @@ inline
488488
Cube<elem_type>
489489
BaseCube_eval_expr<elem_type, derived>::eval() const
490490
{
491-
arma_extra_debug_sigprint();
491+
arma_debug_sigprint();
492492

493493
return Cube<elem_type>( static_cast<const derived&>(*this) );
494494
}

0 commit comments

Comments
 (0)