Skip to content
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

Retire deprecated Options classes #649

Merged
merged 2 commits into from
Oct 5, 2017

Conversation

briadam
Copy link
Contributor

@briadam briadam commented Oct 5, 2017

Remove classes SequenceStatisticalOptions and
MetropolisHastingsSGOptions. Required writing new copy constructor so
MhOptionsValues could be built from an MLSampleLevelOptions object.

This to be merged to dev prior to completion of #569 I don't think there's anything too controversial to request review on, but wouldn't mind a quick look. Some of the code will cleanup as I finish up #569

Remove classes SequenceStatisticalOptions and
MetropolisHastingsSGOptions.  Required writing new copy constructor so
MhOptionsValues could be built from an MLSampleLevelOptions object.
Cleanup more deprecated code related to SequenceStatisticalOptions and
MetropolisHastingsSGOptions

There remains some more unreachable code, but a great many errors crop
up when enabling QUESO_USES_SEQUENCE_STATISTICAL_OPTIONS, so not going
to ferret them all out right now.
@briadam briadam requested review from dmcdougall and roystgnr October 5, 2017 04:43
@briadam
Copy link
Contributor Author

briadam commented Oct 5, 2017

Actually one outstanding question: can code protected by

#ifdef QUESO_USES_SEQUENCE_STATISTICAL_OPTIONS

be removed? SsOptionsValues in particular? That preprocessor define is hardwired off in Defines.h, but associated code is not marked deprecated, so I left it in place, although didn't test as flipping that define caused all manner of chaos.

@codecov
Copy link

codecov bot commented Oct 5, 2017

Codecov Report

Merging #649 into dev will increase coverage by 0.3%.
The diff coverage is 92.18%.

Impacted file tree graph

@@            Coverage Diff            @@
##              dev     #649     +/-   ##
=========================================
+ Coverage   74.85%   75.15%   +0.3%     
=========================================
  Files         312      312             
  Lines       23794    23692    -102     
=========================================
- Hits        17810    17805      -5     
+ Misses       5984     5887     -97
Impacted Files Coverage Δ
src/basic/src/VectorSequence.C 93.75% <ø> (ø) ⬆️
..._StatisticalInverseProblem/test_no_initial_point.C 95% <ø> (ø) ⬆️
src/stats/src/MLSamplingLevelOptions.C 90.18% <ø> (ø) ⬆️
src/stats/src/MetropolisHastingsSG.C 72.8% <50%> (+0.03%) ⬆️
src/stats/src/MetropolisHastingsSGOptions.C 89.38% <93.54%> (+20.77%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2020202...c30191d. Read the comment docs.

@roystgnr
Copy link
Member

roystgnr commented Oct 5, 2017

That define looks like it's been hardwired since 2012, and we're obviously not supporting it, so I'd say strip it out, but let's wait to hear from @dmcdougall to confirm first.

Copy link
Member

@roystgnr roystgnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'd have factored into commits slightly differently, but the end result looks good and the intermediate commit passes "make check" too so I'm happy.

@briadam
Copy link
Contributor Author

briadam commented Oct 5, 2017

Yes, I confirmed it passed in between. I would have done differently as well, but had missed some code on my first pass (due to conditional compilation) and it didn't seem worth a careful revert and re-apply. I'm thinking I'll merge this PR and then pick up the sequence stat options based on Damon's feedback.

@briadam briadam merged commit 6191701 into libqueso:dev Oct 5, 2017
@briadam briadam deleted the rm_deprecated_options branch October 5, 2017 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants