New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better handling of adaptation and algorithm parameters #24

Merged
merged 2 commits into from Aug 11, 2017

Conversation

Projects
None yet
3 participants
@LeahPrice
Collaborator

LeahPrice commented Aug 11, 2017

Following on from our discussion in #23, I'm now passing the algorithm parameters to all of the necessary functions.

The first commit separates the algorithm parameters and adaptation object. The algorithm parameters are passed to the adaptation functions and accessed elsewhere through Sampler->GetAlgParams(). The second commit goes further to pass the algorithm parameters to the moveset functions as well.

Sorry about all of the white space changes hiking up the addition/deletion numbers. I'm not even sure how I would have gone about changing a whole section of indentation like that, but I had the ignore white space option in Gitkraken turned on so I didn't notice (I've turn it off now).

LeahPrice added some commits Aug 11, 2017

Separating parameter object and adaptation object
Taking the additional parameters out of the adaptation object and making them a member of sampler.

Referring to the Sampler object directly to get the algorithm parameters in the examples.
@adamjohansen

This all looks good to me and seems to resolve a problem I was having elsewhere, so thank you...

There should be an entry in NEWS for a change of this magnitude, though...

(If you find yourself needing to make a lot of changes to whitespace it can be convenient to commit those separately so that it's apparent that none of the changes do anything of substance...)

@eddelbuettel

This comment has been minimized.

Show comment
Hide comment
@eddelbuettel

eddelbuettel Aug 11, 2017

Collaborator

Second Adam's comment re NEWS, lovely that you keep ChangeLog current with good detail, a higher level change entry for NEWS.Rd is always good too.

Collaborator

eddelbuettel commented Aug 11, 2017

Second Adam's comment re NEWS, lovely that you keep ChangeLog current with good detail, a higher level change entry for NEWS.Rd is always good too.

@eddelbuettel eddelbuettel merged commit fb1b63c into rcppsmc:master Aug 11, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@LeahPrice

This comment has been minimized.

Show comment
Hide comment
@LeahPrice

LeahPrice Aug 12, 2017

Collaborator

Okay, thanks. I had been writing the entries after the pull requests so I can reference the pull request, but I guess I know what number it will be beforehand anyway. I'll update that in the next pull request.

Collaborator

LeahPrice commented Aug 12, 2017

Okay, thanks. I had been writing the entries after the pull requests so I can reference the pull request, but I guess I know what number it will be beforehand anyway. I'll update that in the next pull request.

@LeahPrice LeahPrice deleted the LeahPrice:PassingParameters branch Aug 12, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment