From 606cad139c7b829dcc25bed9754860b55e09218b Mon Sep 17 00:00:00 2001 From: James J Balamuta Date: Thu, 5 Oct 2023 23:11:13 -0700 Subject: [PATCH 1/5] Fix URLs (HTTP -> HTTPS) --- DESCRIPTION | 4 ++-- NEWS.md | 8 +++++--- README.md | 2 +- man/RcppEnsmallen-package.Rd | 2 +- vignettes/using-rcppensmallen.Rmd | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 05dada7..a223c91 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,9 +23,9 @@ Description: 'Ensmallen' is a templated C++ mathematical optimization library the GNU GPL version 2 or later. Thus, 'RcppEnsmallen' is also licensed under similar terms. Note that 'Ensmallen' requires a compiler that supports 'C++11' and 'Armadillo' 9.800 or later. -Depends: R (>= 3.3.0) +Depends: R (>= 4.0.0) License: GPL (>= 2) -URL: https://github.com/coatless-rpkg/rcppensmallen, https://github.com/mlpack/ensmallen, http://ensmallen.org/ +URL: https://github.com/coatless-rpkg/rcppensmallen, https://github.com/mlpack/ensmallen, https://ensmallen.org/ BugReports: https://github.com/coatless-rpkg/rcppensmallen/issues Encoding: UTF-8 LinkingTo: Rcpp, RcppArmadillo (>= 0.9.800.0.0) diff --git a/NEWS.md b/NEWS.md index 6b159b9..cde661d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,8 +10,10 @@ - Rename `SCD` optimizer, to `CD` ([#379](https://github.com/mlpack/ensmallen/pull/379)). - Updated GitHub Action runners `update-ensmallen-refresh` and `pkgdown` to address deprecation notices. - ([#53](https://github.com/coatless-rpkg/rcppensmallen/53), [#54](https://github.com/coatless-rpkg/rcppensmallen/54), [#55](https://github.com/coatless-rpkg/rcppensmallen/55)). + ([#53](https://github.com/coatless-rpkg/rcppensmallen/pull/53), [#54](https://github.com/coatless-rpkg/rcppensmallen/pull/54), [#55](https://github.com/coatless-rpkg/rcppensmallen/pull/55)). - Removed explicit C++11 requirement from `DESCRIPTION` and `Makevars{.win}`. +- Increased the R version required to R 4.0 to ensure a compiler with + C++11 is available. # RcppEnsmallen 0.2.19.1.1 @@ -19,7 +21,7 @@ - Avoid deprecation warnings in Armadillo 11.2+ ([#347](https://github.com/mlpack/ensmallen/pull/347)). - Updated GitHub Action's runner to the latest versions - ([#51](https://github.com/coatless-rpkg/rcppensmallen/51)). + ([#51](https://github.com/coatless-rpkg/rcppensmallen/pull/51)). # RcppEnsmallen 0.2.19.0.1 @@ -345,7 +347,7 @@ ## New - Support for compiling via _R_ the mathematical optimizers in the _C++_ - [ensmallen](http://ensmallen.org/docs.html) library. + [ensmallen](https://ensmallen.org/docs.html) library. - Includes ensmallen release 1.10.0 "Corporate Catabolism" (2018-10-19) ## Special Thanks diff --git a/README.md b/README.md index 36c494c..c1d1108 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ gradient-free optimizers, and constrained optimization. The RcppEnsmallen package includes the header files from the Ensmallen library and pairs the appropriate header files from -[Armadillo](http://arma.sourceforge.net/) through the +[Armadillo](https://arma.sourceforge.net/) through the [RcppArmadillo](https://cran.r-project.org/package=RcppArmadillo) package. Therefore, users do not need to install Ensmallen nor Armadillo to use RcppEnsmallen. diff --git a/man/RcppEnsmallen-package.Rd b/man/RcppEnsmallen-package.Rd index 5f4f329..24b4c2f 100644 --- a/man/RcppEnsmallen-package.Rd +++ b/man/RcppEnsmallen-package.Rd @@ -13,7 +13,7 @@ Useful links: \itemize{ \item \url{https://github.com/coatless-rpkg/rcppensmallen} \item \url{https://github.com/mlpack/ensmallen} - \item \url{http://ensmallen.org/} + \item \url{https://ensmallen.org/} \item Report bugs at \url{https://github.com/coatless-rpkg/rcppensmallen/issues} } diff --git a/vignettes/using-rcppensmallen.Rmd b/vignettes/using-rcppensmallen.Rmd index e85d387..6c7f448 100644 --- a/vignettes/using-rcppensmallen.Rmd +++ b/vignettes/using-rcppensmallen.Rmd @@ -31,8 +31,8 @@ Alternatively, work has been done by Dirk Schumacher in [`armacmp`](https://github.com/dirkschumacher/armacmp) to automatically create the underlying _C++_ code from _R_. -**Note:** Optimizers in `RcppEnsmallen` only work with [`armadillo`](http://arma.sourceforge.net/docs.html) -data structures. Thus, if using [`Eigen`](http://eigen.tuxfamily.org/index.php?title=Main_Page) through +**Note:** Optimizers in `RcppEnsmallen` only work with [`armadillo`](https://arma.sourceforge.net/docs.html) +data structures. Thus, if using [`Eigen`](https://eigen.tuxfamily.org/index.php?title=Main_Page) through [`RcppEigen`](https://cran.r-project.org/package=RcppEigen), please consider the [`RcppNumerical`](https://cran.r-project.org/package=RcppNumerical) package. From 10b872429f8bd2978643b036ae79e8b24c0bbb76 Mon Sep 17 00:00:00 2001 From: James J Balamuta Date: Thu, 5 Oct 2023 23:11:22 -0700 Subject: [PATCH 2/5] Update authors --- inst/AUTHORS | 1 + inst/COPYRIGHTS | 1 + 2 files changed, 2 insertions(+) diff --git a/inst/AUTHORS b/inst/AUTHORS index 067e528..cf5d4a7 100644 --- a/inst/AUTHORS +++ b/inst/AUTHORS @@ -33,6 +33,7 @@ file: Copyright 2019, Rahul Ganesh Prabhu Copyright 2019, Roberto Hueso Copyright 2019, Sayan Goswami + Copyright 2020, Joe Dinius The RcppEnsmallen package provides an integration of Ensmallen and its dependences into R. RcppEnsmallen accomplishes this by linking into RcppArmadillo, diff --git a/inst/COPYRIGHTS b/inst/COPYRIGHTS index 401e75d..c3863fe 100644 --- a/inst/COPYRIGHTS +++ b/inst/COPYRIGHTS @@ -48,6 +48,7 @@ Copyright: Copyright 2019, Rahul Ganesh Prabhu Copyright 2019, Roberto Hueso Copyright 2019, Sayan Goswami + Copyright 2020, Joe Dinius License: BSD-3-clause All rights reserved. From cfe6565fa0de64d96fc48ec86dc77a57d41813a0 Mon Sep 17 00:00:00 2001 From: James J Balamuta Date: Thu, 5 Oct 2023 23:11:29 -0700 Subject: [PATCH 3/5] Fix citation --- inst/CITATION | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/inst/CITATION b/inst/CITATION index 7f66091..1041e7c 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -2,9 +2,9 @@ citHeader("To cite the 'RcppEnsmallen' R package and 'Ensmallen' libray in publi citEntry(entry = "Manual", title = "{RcppEnsmallen: Header-Only C++ Mathematical Optimization Library for 'Armadillo'}", - author = personList(as.person("James Joseph Balamuta"), - as.person("Dirk Eddelbuettel") - ), + author = c(as.person("James Joseph Balamuta"), + as.person("Dirk Eddelbuettel") + ), year = 2018, textVersion = paste("Balamuta, J.J. and Eddelbuettel, D. (2018)", "RcppEnsmallen: Header-Only C++ Mathematical Optimization Library for 'Armadillo'.", @@ -13,11 +13,11 @@ citEntry(entry = "Manual", citEntry(entry = "Article", title = "{ensmallen: a flexible C++ library for efficient function optimization}", - author = personList(as.person("Shikhar Bhardwaj"), - as.person("Ryan R. Curtin"), - as.person("Marcus Edel"), - as.person("Yannis Mentekidis"), - as.person("Conrad Sanderson")), + author = c(as.person("Shikhar Bhardwaj"), + as.person("Ryan R. Curtin"), + as.person("Marcus Edel"), + as.person("Yannis Mentekidis"), + as.person("Conrad Sanderson")), journal = "Workshop on Systems for ML and Open Source Software at NIPS", year = "2018", month = "dec", From 506b0af23bb8214a2fad516ec4918fb1f8537c68 Mon Sep 17 00:00:00 2001 From: James J Balamuta Date: Thu, 5 Oct 2023 23:11:35 -0700 Subject: [PATCH 4/5] Add changelog entries --- ChangeLog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0086e3b..0b26982 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ 2023-10-05 James Balamuta + * NEWS.md: Fixed redirected HTTP to HTTPS urls + * DESCRIPTION: ditto + * vignettes/using-rcppensmallen.Rmd: ditto + * NEWS.md: Restored mlpack/ensmallen URLs - * DESCRIPTION: Removed CXX11 requirement + * DESCRIPTION: Removed CXX11 requirement and bumped R version required to 4.0 * src/Makevars: ditto * src/Makevars.win: ditto From 1544e4001ddfc2f8b4be1d67f688420f1cd9a43e Mon Sep 17 00:00:00 2001 From: James J Balamuta Date: Thu, 5 Oct 2023 23:26:22 -0700 Subject: [PATCH 5/5] citEntry() -> bibentry() --- inst/CITATION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/CITATION b/inst/CITATION index 1041e7c..2e214b6 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -1,6 +1,6 @@ citHeader("To cite the 'RcppEnsmallen' R package and 'Ensmallen' libray in publications, please use:") -citEntry(entry = "Manual", +bibentry(bibtype = "Manual", title = "{RcppEnsmallen: Header-Only C++ Mathematical Optimization Library for 'Armadillo'}", author = c(as.person("James Joseph Balamuta"), as.person("Dirk Eddelbuettel") @@ -11,7 +11,7 @@ citEntry(entry = "Manual", "URL https://cran.r-project.org/package=RcppEnsmallen.") ) -citEntry(entry = "Article", +bibentry(bibtype = "Article", title = "{ensmallen: a flexible C++ library for efficient function optimization}", author = c(as.person("Shikhar Bhardwaj"), as.person("Ryan R. Curtin"),