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

Update calibration methods, add tests. #31

Merged
merged 1 commit into from
Mar 24, 2016
Merged

Conversation

bas-rustenburg
Copy link
Member

MBAR calibration currently not working because it depends on context in the initialization. Will fix this at another time.

@bas-rustenburg bas-rustenburg merged commit dab15c5 into master Mar 24, 2016
@jchodera
Copy link
Member

MBAR calibration currently not working because it depends on context in the initialization

Can you elaborate?

@bas-rustenburg
Copy link
Member Author

Sure. The calibration class that uses MBAR currently uses context as an argument in it's __init__ function. However, since we now use a compound integrator, and generate a context using that integrator, we have to define the Titration object first before we have a context.

I may be able to move this so context isn't needed in __init__. I could potentially merge it into the other calibration class.

@bas-rustenburg
Copy link
Member Author

@jchodera
Copy link
Member

Ah, so you just need to fix up the API.

Why not just replace context with system, and take an optional platform argument?

@bas-rustenburg
Copy link
Member Author

For the sake of unifying the APIs, I think with a little bit of work, we can include an mbar option as an alternative to eq9 and eq12, as opposed to fixing the MBAR class with a separate api.

The one thing in which the classes fundamentally differ -- which will be the part that takes some work --is storing all the previous states. Right now MBarCalibrationTitration use this adaptation_tracker dictionary entry to keep track of all past samples. Its __init__ requires a context because I need to extract the potential for the initial state. I would have to incorporate that into the CalibrationTitration code.

It'll take some time, and for now it isn't high priority, since we can already use SAMS on-line. MBAR was just an interesting at-line alternative, and we could just run MBAR off-line if we wanted to. Not fixing this right now shouldn't hold up our development.

@bas-rustenburg
Copy link
Member Author

Added reminder to #20.

@gregoryross
Copy link
Collaborator

You've probably already done this, but have you compared the free energies you get with SAMS with the free energies you get with MBAR? This is an important validation test for the SAMS code.

@bas-rustenburg
Copy link
Member Author

@gregoryross Very qualitatively yes, they seemed to match up, but I'd like to set up a test suite/example set that proves this.

@bas-rustenburg
Copy link
Member Author

Added reminder for that to #20.

@bas-rustenburg bas-rustenburg deleted the todo/calibration branch July 21, 2016 20:33
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.

3 participants