Upgrade ensmallen to 2.15.0 (#39)

* Upgrade ensmallen to 2.15.0

* Apply suggestions from code review

* Add CRAN comments

* Upgrade ensmallen to 2.15.0

* Fix header inclusion order

Co-authored-by: coatless <[email protected]>
Co-authored-by: James Balamuta <[email protected]>

Author: github-actions[bot]

ChangeLog

@@ -1,3 +1,10 @@
+2020-11-03  James Balamuta  <[email protected]>
+
+	* DESCRIPTION (Version): Release 2.15.0
+	* NEWS.md: Update for Ensmallen release 2.15.0
+	* inst/include/ensmallen_bits: Upgraded to Ensmallen 2.15.0
+	* inst/include/ensmallen.hpp: ditto
+
 2020-09-05  James Balamuta  <[email protected]>
 
 	* DESCRIPTION (Version): Release 2.14.2
@@ -18,7 +25,7 @@
 
 	* .github/workflows/upstream-refresh.yaml: Fix NEWS.md entry formatting
 	issues.
-  
+
 2020-08-21  James Balamuta  <[email protected]>
 
 	* .github/workflows/upstream-refresh.yaml: Add GitHub Action to

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: RcppEnsmallen
 Title: Header-Only C++ Mathematical Optimization Library for 'Armadillo'
-Version: 0.2.14.2.1
+Version: 0.2.15.0.1
 Authors@R: c(
     person("James Joseph", "Balamuta", email = "[email protected]", 
            role = c("aut", "cre", "cph"), 

NEWS.md

@@ -1,3 +1,14 @@
+# RcppEnsmallen 0.2.15.0.1
+
+- Upgraded to ensmallen 2.15.0: "No Direction Home" (2020-11-03)
+  - Make a few tests more robust
+    ([#228](https://github.com/mlpack/ensmallen/pull/228)).
+  - Add release date to version information. ([#226](https://github.com/mlpack/ensmallen/pull/226))
+  - Fix typo in release script
+    ([#236](https://github.com/mlpack/ensmallen/pull/236)).
+  - Add optimizer summary report callback 
+    ([#213](https://github.com/mlpack/ensmallen/pull/213)).
+
 # RcppEnsmallen 0.2.14.2.1
 
 - Upgraded to ensmallen 2.14.2: "No Direction Home" (2020-09-05)

cran-comments.md

@@ -1,7 +1,7 @@
 ## Test environments
 
-* local macOS install, R 4.0.2
-* ubuntu 16.04 (with GitHub Actions), R 4.0.2
+* local macOS install, R 4.0.3
+* ubuntu 16.04 (with GitHub Actions), R 4.0.3
 * win-builder (devel and release)
 
 ## R CMD check results

inst/include/ensmallen.hpp

@@ -66,11 +66,15 @@
 #include "ensmallen_bits/utility/any.hpp"
 #include "ensmallen_bits/utility/arma_traits.hpp"
 
+// Contains traits, must be placed before report callback.
+#include "ensmallen_bits/function.hpp" // TODO: should move to function/
+
 // Callbacks.
 #include "ensmallen_bits/callbacks/callbacks.hpp"
 #include "ensmallen_bits/callbacks/early_stop_at_min_loss.hpp"
 #include "ensmallen_bits/callbacks/print_loss.hpp"
 #include "ensmallen_bits/callbacks/progress_bar.hpp"
+#include "ensmallen_bits/callbacks/report.hpp"
 #include "ensmallen_bits/callbacks/store_best_coordinates.hpp"
 #include "ensmallen_bits/callbacks/timer_stop.hpp"
 
@@ -89,8 +93,6 @@
 #include "ensmallen_bits/eve/eve.hpp"
 #include "ensmallen_bits/ftml/ftml.hpp"
 
-#include "ensmallen_bits/function.hpp" // TODO: should move to function/
-
 #include "ensmallen_bits/fw/frank_wolfe.hpp"
 #include "ensmallen_bits/gradient_descent/gradient_descent.hpp"
 #include "ensmallen_bits/grid_search/grid_search.hpp"