Skip to content

Commit 2ee4dc1

Browse files
committed
changes per code review
1 parent ad0bd35 commit 2ee4dc1

File tree

3 files changed

+3
-43
lines changed

3 files changed

+3
-43
lines changed

src/stan/analyze/mcmc/compute_effective_sample_size.hpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ namespace analyze {
3131
* @param sizes stores sizes of chains
3232
* @return effective sample size for the specified parameter
3333
*/
34-
#if defined(__GNUC__) || defined(__clang__)
35-
__attribute__((deprecated))
36-
#elif defined(_MSC_VER)
37-
__declspec(deprecated)
38-
#endif
3934
inline double
4035
compute_effective_sample_size(std::vector<const double*> draws,
4136
std::vector<size_t> sizes) {
@@ -166,11 +161,6 @@ compute_effective_sample_size(std::vector<const double*> draws,
166161
* @param size size of chains
167162
* @return effective sample size for the specified parameter
168163
*/
169-
#if defined(__GNUC__) || defined(__clang__)
170-
__attribute__((deprecated))
171-
#elif defined(_MSC_VER)
172-
__declspec(deprecated)
173-
#endif
174164
inline double
175165
compute_effective_sample_size(std::vector<const double*> draws, size_t size) {
176166
int num_chains = draws.size();
@@ -199,11 +189,6 @@ compute_effective_sample_size(std::vector<const double*> draws, size_t size) {
199189
* @param sizes stores sizes of chains
200190
* @return effective sample size for the specified parameter
201191
*/
202-
#if defined(__GNUC__) || defined(__clang__)
203-
__attribute__((deprecated))
204-
#elif defined(_MSC_VER)
205-
__declspec(deprecated)
206-
#endif
207192
inline double
208193
compute_split_effective_sample_size(std::vector<const double*> draws,
209194
std::vector<size_t> sizes) {
@@ -243,11 +228,6 @@ compute_split_effective_sample_size(std::vector<const double*> draws,
243228
* @param size size of chains
244229
* @return effective sample size for the specified parameter
245230
*/
246-
#if defined(__GNUC__) || defined(__clang__)
247-
__attribute__((deprecated))
248-
#elif defined(_MSC_VER)
249-
__declspec(deprecated)
250-
#endif
251231
inline double
252232
compute_split_effective_sample_size(std::vector<const double*> draws,
253233
size_t size) {

src/stan/analyze/mcmc/compute_potential_scale_reduction.hpp

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace stan {
1818
namespace analyze {
1919

2020
/**
21-
* DEPRECATED - re-implemented as function `rhat`.
21+
* \deprecated use `rhat` instead
2222
*
2323
* Computes the potential scale reduction (Rhat) for the specified
2424
* parameter across all kept samples.
@@ -34,11 +34,6 @@ namespace analyze {
3434
* @param sizes stores sizes of chains
3535
* @return potential scale reduction for the specified parameter
3636
*/
37-
#if defined(__GNUC__) || defined(__clang__)
38-
__attribute__((deprecated))
39-
#elif defined(_MSC_VER)
40-
__declspec(deprecated)
41-
#endif
4237
inline double
4338
compute_potential_scale_reduction(std::vector<const double*> draws,
4439
std::vector<size_t> sizes) {
@@ -127,11 +122,6 @@ compute_potential_scale_reduction(std::vector<const double*> draws,
127122
* @param size stores sizes of chains
128123
* @return potential scale reduction for the specified parameter
129124
*/
130-
#if defined(__GNUC__) || defined(__clang__)
131-
__attribute__((deprecated))
132-
#elif defined(_MSC_VER)
133-
__declspec(deprecated)
134-
#endif
135125
inline double
136126
compute_potential_scale_reduction(std::vector<const double*> draws,
137127
size_t size) {
@@ -158,11 +148,6 @@ compute_potential_scale_reduction(std::vector<const double*> draws,
158148
* @param sizes stores sizes of chains
159149
* @return potential scale reduction for the specified parameter
160150
*/
161-
#if defined(__GNUC__) || defined(__clang__)
162-
__attribute__((deprecated))
163-
#elif defined(_MSC_VER)
164-
__declspec(deprecated)
165-
#endif
166151
inline double
167152
compute_split_potential_scale_reduction(std::vector<const double*> draws,
168153
std::vector<size_t> sizes) {
@@ -199,11 +184,6 @@ compute_split_potential_scale_reduction(std::vector<const double*> draws,
199184
* @param size stores sizes of chains
200185
* @return potential scale reduction for the specified parameter
201186
*/
202-
#if defined(__GNUC__) || defined(__clang__)
203-
__attribute__((deprecated))
204-
#elif defined(_MSC_VER)
205-
__declspec(deprecated)
206-
#endif
207187
inline double
208188
compute_split_potential_scale_reduction(std::vector<const double*> draws,
209189
size_t size) {

src/stan/analyze/mcmc/mcse.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ inline double mcse_mean(const Eigen::MatrixXd& chains) {
2525
if (chains.rows() < 4 || !is_finite_and_varies(chains))
2626
return std::numeric_limits<double>::quiet_NaN();
2727

28-
double sd
28+
double sample_var
2929
= (chains.array() - chains.mean()).square().sum() / (chains.size() - 1);
30-
return std::sqrt(sd / ess(chains));
30+
return std::sqrt(sample_var / ess(chains));
3131
}
3232

3333
/**

0 commit comments

Comments
 (0)