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

Further small updates to examples, quickmodel, and pymcmodels #113

Merged
merged 4 commits into from
Jun 23, 2017

Conversation

sonyahanson
Copy link
Contributor

In this PR I hope to tackle a few small updates:

  • update examples to not have env PYTHONPATH="./"
  • fix parsing in quickmodel to be slightly more flexible, currently it seems to stop at 4 ligands, which is not how our 384-well plates are organized
  • Remove AdaptiveMetropolis in pymcmodels
  • Change dLstated and dPstated to be provided in input files in quickmodel

# log_F_PL is highly correlated with DeltaG
mcmc.use_step_method(pymc.AdaptiveMetropolis, [pymc_model.log_F_PL, pymc_model.DeltaG], scales={ pymc_model.log_F_PL : 0.1, pymc_model.DeltaG : 0.1 })
# Uncomment below to use log_F_PL highly correlated with DeltaG to improve sampling somewhat.
#mcmc.use_step_method(pymc.AdaptiveMetropolis, [pymc_model.log_F_PL, pymc_model.DeltaG], scales={ pymc_model.log_F_PL : 0.1, pymc_model.DeltaG : 0.1 })
Copy link
Member

Choose a reason for hiding this comment

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

I think we have to add back Metropolis methods for log_F_PL and DeltaG.

Copy link
Member

Choose a reason for hiding this comment

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

That would be something like

mcmc.use_step_method(pymc.Metropolis, getattr(pymc_model, 'log_F_PL'), proposal_sd=0.1, proposal_distribution='Normal')
mcmc.use_step_method(pymc.Metropolis, getattr(pymc_model, 'DeltaG'), proposal_sd=0.1, proposal_distribution='Normal')

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Oh! Right, thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, those exact lines were never removed and are still at lines 771-2.

@sonyahanson
Copy link
Contributor Author

All these changes are done! You can now define P_error in your inputs file, as is now in the inputs_example.py in scripts.

Mergeable when checks pass.

@jchodera
Copy link
Member

Woohoo!

@sonyahanson sonyahanson merged commit 8c32e6e into master Jun 23, 2017
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.

None yet

2 participants