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

Expanded ensemble #421

Open
wants to merge 179 commits into
base: expanded-ensemble
Choose a base branch
from

Conversation

ajsilveira
Copy link

  • Include the option weight_update to perform expanded ensemble simulations
  • minimum_visits and beta_factor are defined by the user
  • set histogram as the default for flatness criteria

Copy link
Contributor

@andrrizzi andrrizzi left a comment

Choose a reason for hiding this comment

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

Looks good to me, but tests are currently failing. I've pointed out where I think the problem is.

@@ -628,7 +648,6 @@ def _update_logZ_estimates(self, replicas_log_P_k):
for (replica_index, state_index) in enumerate(self._replica_thermodynamic_states):
logger.debug(' Replica %d state %d' % (replica_index, state_index))
# Compute attenuation factor gamma
beta_factor = 0.8
Copy link
Contributor

Choose a reason for hiding this comment

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

This may be the main cause of test errors. The local variable beta_factor is deleted here, but I don't see self.beta_factor used anywhere.

@andrrizzi
Copy link
Contributor

Thank you! I think this is ready to be merged. Can you just update the releasehistory.rst in docs/ before?

@ajsilveira
Copy link
Author

This would be an "enhancement" in 0.19.0 version ?

@andrrizzi
Copy link
Contributor

Yes, that works.

andrrizzi and others added 30 commits November 8, 2019 11:21
Co-Authored-By: Josh Fass <josh.fass@choderalab.org>
Fix travis since miniconda changed location
…rium-integrator

Add PeriodicNonequilibriumIntegrator
…ilibrium

Fix an issue with accidentally resetting PeriodicNonequilibriumIntegrator
Update neq integrator tests to generate trajectory.
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

6 participants