Skip to content

Commit 210fe90

Browse files
committed
[mcmc/base_adapter][NFC] add const and noexcept where appropriate
allow querying the `adapting()` status of a const sampler, and mark loading/storing the bool member noexcept, after checking the relevant overrides in the derived `adapt_...` samplers.
1 parent bf98eee commit 210fe90

21 files changed

+24
-24
lines changed

src/stan/mcmc/base_adapter.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ namespace mcmc {
66

77
class base_adapter {
88
public:
9-
base_adapter() : adapt_flag_(false) {}
9+
base_adapter() noexcept : adapt_flag_(false) {}
1010

11-
virtual void engage_adaptation() { adapt_flag_ = true; }
11+
virtual void engage_adaptation() noexcept { adapt_flag_ = true; }
1212

13-
virtual void disengage_adaptation() { adapt_flag_ = false; }
13+
virtual void disengage_adaptation() noexcept { adapt_flag_ = false; }
1414

15-
bool adapting() { return adapt_flag_; }
15+
bool adapting() const noexcept { return adapt_flag_; }
1616

1717
protected:
1818
bool adapt_flag_;

src/stan/mcmc/hmc/nuts/adapt_dense_e_nuts.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class adapt_dense_e_nuts : public dense_e_nuts<Model, BaseRNG>,
4242
return s;
4343
}
4444

45-
void disengage_adaptation() {
45+
void disengage_adaptation() noexcept {
4646
base_adapter::disengage_adaptation();
4747
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
4848
}

src/stan/mcmc/hmc/nuts/adapt_diag_e_nuts.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class adapt_diag_e_nuts : public diag_e_nuts<Model, BaseRNG>,
4242
return s;
4343
}
4444

45-
void disengage_adaptation() {
45+
void disengage_adaptation() noexcept {
4646
base_adapter::disengage_adaptation();
4747
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
4848
}

src/stan/mcmc/hmc/nuts/adapt_softabs_nuts.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class adapt_softabs_nuts : public softabs_nuts<Model, BaseRNG>,
3131
return s;
3232
}
3333

34-
void disengage_adaptation() {
34+
void disengage_adaptation() noexcept {
3535
base_adapter::disengage_adaptation();
3636
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
3737
}

src/stan/mcmc/hmc/nuts/adapt_unit_e_nuts.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class adapt_unit_e_nuts : public unit_e_nuts<Model, BaseRNG>,
3131
return s;
3232
}
3333

34-
void disengage_adaptation() {
34+
void disengage_adaptation() noexcept {
3535
base_adapter::disengage_adaptation();
3636
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
3737
}

src/stan/mcmc/hmc/nuts_classic/adapt_dense_e_nuts_classic.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class adapt_dense_e_nuts_classic : public dense_e_nuts_classic<Model, BaseRNG>,
4242
return s;
4343
}
4444

45-
void disengage_adaptation() {
45+
void disengage_adaptation() noexcept {
4646
base_adapter::disengage_adaptation();
4747
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
4848
}

src/stan/mcmc/hmc/nuts_classic/adapt_diag_e_nuts_classic.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class adapt_diag_e_nuts_classic : public diag_e_nuts_classic<Model, BaseRNG>,
4343
return s;
4444
}
4545

46-
void disengage_adaptation() {
46+
void disengage_adaptation() noexcept {
4747
base_adapter::disengage_adaptation();
4848
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
4949
}

src/stan/mcmc/hmc/nuts_classic/adapt_unit_e_nuts_classic.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class adapt_unit_e_nuts_classic : public unit_e_nuts_classic<Model, BaseRNG>,
3232
return s;
3333
}
3434

35-
void disengage_adaptation() {
35+
void disengage_adaptation() noexcept {
3636
base_adapter::disengage_adaptation();
3737
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
3838
}

src/stan/mcmc/hmc/static/adapt_dense_e_static_hmc.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class adapt_dense_e_static_hmc : public dense_e_static_hmc<Model, BaseRNG>,
4646
return s;
4747
}
4848

49-
void disengage_adaptation() {
49+
void disengage_adaptation() noexcept {
5050
base_adapter::disengage_adaptation();
5151
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
5252
}

src/stan/mcmc/hmc/static/adapt_diag_e_static_hmc.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class adapt_diag_e_static_hmc : public diag_e_static_hmc<Model, BaseRNG>,
4646
return s;
4747
}
4848

49-
void disengage_adaptation() {
49+
void disengage_adaptation() noexcept {
5050
base_adapter::disengage_adaptation();
5151
this->stepsize_adaptation_.complete_adaptation(this->nom_epsilon_);
5252
}

0 commit comments

Comments
 (0)