Skip to content

Commit 76250f7

Browse files
committed
Edits to DESCRIPTION and NEWS, s/arma::is_finite/std::isfinite/
1 parent c6e1550 commit 76250f7

File tree

4 files changed

+27
-23
lines changed

4 files changed

+27
-23
lines changed

ChangeLog

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2025-08-27 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): RcppArmadillo 15.0.1-1
4+
* inst/NEWS.Rd: Idem
5+
* configure.ac: Idem
6+
* configure: Idem
7+
8+
* inst/include/RcppArmadilloExtensions/fixprob.h: Replace deprecated
9+
arma::is_finite(val) with std::isfinite(val)
10+
111
2025-08-23 Dirk Eddelbuettel <[email protected]>
212

313
* DESCRIPTION (Description): Rewritten and updated, add mention of
@@ -11,11 +21,6 @@
1121

1222
2025-08-22 Dirk Eddelbuettel <[email protected]>
1323

14-
* DESCRIPTION (Version, Date): RcppArmadillo 15.0.1-1
15-
* inst/NEWS.Rd: Idem
16-
* configure.ac: Idem
17-
* configure: Idem
18-
1924
* inst/include/current/: Armadillo 15.0.1
2025

2126
2025-08-21 Dirk Eddelbuettel <[email protected]>

DESCRIPTION

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: RcppArmadillo
22
Type: Package
33
Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
44
Version: 15.0.1-1
5-
Date: 2025-08-23
5+
Date: 2025-08-27
66
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
77
comment = c(ORCID = "0000-0001-6419-907X")),
88
person("Romain", "Francois", role = "aut",
@@ -21,17 +21,16 @@ Description: 'Armadillo' is a templated C++ linear algebra library aiming toward
2121
A sophisticated expression evaluator (based on template meta-programming) automatically
2222
combines several operations to increase speed and efficiency. Dynamic evaluation
2323
automatically chooses optimal code paths based on detected matrix structures.
24-
Matrix decompositions (eigen, SVD, Cholesky, etc) are provided through integration
25-
with LAPACK, or one of its high performance drop-in replacements (eg. MKL or OpenBLAS).
26-
It can automatically use OpenMP multi-threading (parallelisation) to speed up
24+
Matrix decompositions are provided through integration with LAPACK, or one of its
25+
high performance drop-in replacements (such as 'MKL' or 'OpenBLAS'). It can
26+
automatically use 'OpenMP' multi-threading (parallelisation) to speed up
2727
computationally expensive operations.
2828
.
29-
The 'RcppArmadillo' package includes the header files from the templated 'Armadillo'
30-
library so users do not need to install 'Armadillo' itself in order to use
31-
'RcppArmadillo'.
29+
The 'RcppArmadillo' package includes the header files from the 'Armadillo' library;
30+
users do not need to install 'Armadillo' itself in order to use 'RcppArmadillo'.
3231
.
33-
Starting from release 15.0.0, the minimum compilation standard is C++14 so Armadillo
34-
version 14.6.3 is also included as a fallback when C++11 is used.
32+
Starting from release 15.0.0, the minimum compilation standard is C++14 so 'Armadillo'
33+
version 14.6.3 is included as a fallback when an R package forces the C++11 standard.
3534
.
3635
Since release 7.800.0, 'Armadillo' is licensed under Apache License 2; previous
3736
releases were under licensed as MPL 2.0 from version 3.800.0 onwards and LGPL-3

inst/NEWS.Rd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
\newcommand{\ghpr}{\href{https://github.com/RcppCore/RcppArmadillo/pull/#1}{##1}}
44
\newcommand{\ghit}{\href{https://github.com/RcppCore/RcppArmadillo/issues/#1}{##1}}
55

6-
\section{Changes in RcppArmadillo version 15.0.1-1 (2025-08-22)}{
6+
\section{Changes in RcppArmadillo version 15.0.1-1 (2025-08-27)}{
77
\itemize{
88
\item Upgraded to Armadillo release 15.0.1-1 (Medium Roast)
99
\itemize{
1010
\item Workaround for GCC compiler bug involving misoptimisation of
1111
complex number multiplication
1212
}
13+
\item Update DESCRIPTION and README.md
1314
}
1415
}
1516

inst/include/RcppArmadilloExtensions/fixprob.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
2-
/* :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: */
3-
//
4-
// fixprob.h: helper function for Rcpp/Armadillo random number draws, including sample().
1+
2+
// fixprob.h: helper function for Rcpp/Armadillo random number draws, including sample().
53
// Copyright (C) 2012 - 2014 Christian Gunning
64
// Copyright (C) 2013 Romain Francois
5+
// Copyright (C) 2025 Dirk Eddelbuettel
76
//
87
// This file is part of RcppArmadillo.
98
//
@@ -25,17 +24,17 @@
2524
#include <RcppArmadillo.h>
2625
namespace Rcpp{
2726
namespace RcppArmadillo{
28-
27+
2928
void FixProb(arma::vec &prob, const int size, const bool replace) {
30-
// prob is modified in-place.
29+
// prob is modified in-place.
3130
double sum = 0.0;
3231
int ii, nPos = 0;
3332
int nn = prob.size();
3433
for (ii = 0; ii < nn; ii++) {
3534
// pop stack
3635
double prob_value = prob(ii);
37-
38-
if (!arma::is_finite(prob_value)) //does this work??
36+
37+
if (!std::isfinite(prob_value)) //does this work??
3938
throw std::range_error( "NAs not allowed in probability" ) ;
4039
if (prob_value < 0.0)
4140
throw std::range_error( "Negative probabilities not allowed" ) ;

0 commit comments

Comments
 (0)