Skip to content

Commit c98031d

Browse files
Upgrade ensmallen to 2.16.0 (#41)
* Upgrade ensmallen to 2.16.0 * Apply suggestions from code review Co-authored-by: coatless <[email protected]>
1 parent 6167f85 commit c98031d

30 files changed

+243
-26
lines changed

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2021-02-19 James Balamuta <[email protected]>
2+
3+
* DESCRIPTION (Version): Release 2.16.0
4+
* NEWS.md: Update for Ensmallen release 2.16.0
5+
* inst/include/ensmallen_bits: Upgraded to Ensmallen 2.16.0
6+
* inst/include/ensmallen.hpp: ditto
7+
18
2020-11-06 James Balamuta <[email protected]>
29

310
* DESCRIPTION (Version): Release 2.15.1

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: RcppEnsmallen
22
Title: Header-Only C++ Mathematical Optimization Library for 'Armadillo'
3-
Version: 0.2.15.1.1
3+
Version: 0.2.16.0.1
44
Authors@R: c(
55
person("James Joseph", "Balamuta", email = "[email protected]",
66
role = c("aut", "cre", "cph"),

NEWS.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# RcppEnsmallen 0.2.16.0.1 (GitHub-Only Release)
2+
3+
- Upgraded to ensmallen 2.16.0: "Severely Dented Can Of Polyurethane" (2021-02-19)
4+
- Expand README with example installation and add simple example program
5+
showing usage of the L-BFGS optimizer
6+
([#248](https://github.com/mlpack/ensmallen/pull/248)).
7+
- Refactor tests to increase stability and reduce random errors
8+
([#249](https://github.com/mlpack/ensmallen/pull/249)).
9+
10+
111
# RcppEnsmallen 0.2.15.1.1
212

313
- Upgraded to ensmallen 2.15.1: "Why Can't I Manage To Grow Any Plants?" (2020-11-05)

inst/include/ensmallen_bits/ens_version.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
#define ENS_VERSION_MAJOR 2
1616
// The minor version is two digits so regular numerical comparisons of versions
1717
// work right. The first minor version of a release is always 10.
18-
#define ENS_VERSION_MINOR 15
19-
#define ENS_VERSION_PATCH 1
18+
#define ENS_VERSION_MINOR 16
19+
#define ENS_VERSION_PATCH 0
2020
// If this is a release candidate, it will be reflected in the version name
2121
// (i.e. the version name will be "RC1", "RC2", etc.). Otherwise the version
2222
// name will typically be a seemingly arbitrary set of words that does not
2323
// contain the capitalized string "RC".
24-
#define ENS_VERSION_NAME "Why Can't I Manage To Grow Any Plants?"
24+
#define ENS_VERSION_NAME "Severely Dented Can Of Polyurethane"
2525
// Incorporate the date the version was released.
26-
#define ENS_VERSION_YEAR "2020"
27-
#define ENS_VERSION_MONTH "11"
28-
#define ENS_VERSION_DAY "05"
26+
#define ENS_VERSION_YEAR "2021"
27+
#define ENS_VERSION_MONTH "02"
28+
#define ENS_VERSION_DAY "11"
2929

3030
namespace ens {
3131

inst/include/ensmallen_bits/problems/ackley_function.hpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,14 @@ class AckleyFunction
6161

6262
//! Get the starting point.
6363
template<typename MatType = arma::mat>
64-
MatType GetInitialPoint() const { return MatType("-5.0; 5.0"); }
64+
MatType GetInitialPoint() const { return MatType("0.02; 0.02"); }
65+
66+
//! Get the final point.
67+
template<typename MatType = arma::mat>
68+
MatType GetFinalPoint() const { return MatType("0.0; 0.0"); }
69+
70+
//! Get the final objective.
71+
const double GetFinalObjective() const { return 0.0; }
6572

6673
/**
6774
* Evaluate a function for a particular batch-size.

inst/include/ensmallen_bits/problems/beale_function.hpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,14 @@ class BealeFunction
5454

5555
//! Get the starting point.
5656
template<typename MatType = arma::mat>
57-
MatType GetInitialPoint() const { return MatType("-4.5; 4.5"); }
57+
MatType GetInitialPoint() const { return MatType("2.8; 0.35"); }
58+
59+
//! Get the final point.
60+
template<typename MatType = arma::mat>
61+
MatType GetFinalPoint() const { return MatType("3.0; 0.5"); }
62+
63+
//! Get the final objective.
64+
const double GetFinalObjective() const { return 0.0; }
5865

5966
/**
6067
* Evaluate a function for a particular batch-size.

inst/include/ensmallen_bits/problems/booth_function.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ class BoothFunction
5656
template<typename MatType = arma::mat>
5757
MatType GetInitialPoint() const { return MatType("-9; -9"); }
5858

59+
//! Get the final point.
60+
template<typename MatType = arma::mat>
61+
MatType GetFinalPoint() const { return MatType("1.0; 3.0"); }
62+
63+
//! Get the final objective.
64+
const double GetFinalObjective() const { return 0.0; }
65+
5966
/**
6067
* Evaluate a function for a particular batch-size.
6168
*

inst/include/ensmallen_bits/problems/bukin_function.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ class BukinFunction
6161
template<typename MatType = arma::mat>
6262
MatType GetInitialPoint() const { return MatType("-10; -2.0"); }
6363

64+
//! Get the final point.
65+
template<typename MatType = arma::mat>
66+
MatType GetFinalPoint() const { return MatType("-10.0; 1.0"); }
67+
68+
//! Get the final objective.
69+
const double GetFinalObjective() const { return 0.0; }
70+
6471
/**
6572
* Evaluate a function for a particular batch-size.
6673
*

inst/include/ensmallen_bits/problems/colville_function.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ class ColvilleFunction
5757
template<typename MatType = arma::mat>
5858
MatType GetInitialPoint() const { return MatType("-5; 3; 1; -9"); }
5959

60+
//! Get the final point.
61+
template<typename MatType = arma::mat>
62+
MatType GetFinalPoint() const { return MatType("1; 1; 1; 1"); }
63+
64+
//! Get the final objective.
65+
const double GetFinalObjective() const { return 0.0; }
66+
6067
/**
6168
* Evaluate a function for a particular batch-size.
6269
*

inst/include/ensmallen_bits/problems/drop_wave_function.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ class DropWaveFunction
5656
template<typename MatType = arma::mat>
5757
MatType GetInitialPoint() const { return MatType("0.5; 0.5"); }
5858

59+
//! Get the final point.
60+
template<typename MatType = arma::mat>
61+
MatType GetFinalPoint() const { return MatType("0.0; 0.0"); }
62+
63+
//! Get the final objective.
64+
const double GetFinalObjective() const { return 0.0; }
65+
5966
/**
6067
* Evaluate a function for a particular batch-size.
6168
*

0 commit comments

Comments
 (0)