Closed fjclark closed 1 year ago
Thanks @fjclark. It looks good. We will try to find a way to get the GitHub Actions to run so that we can test it, but I think it should be fine.
Yes, you are right that you can include MIT (or any properly open source license, like Apache, BSD etc) code in a GPL package. The licenses are compatible. We just have to retain copyright notices and make sure that, if code is inspired by another code, that attribution and the original license and copyright is recorded somewhere. As part of the feat_web
work, I am creating a new website that provides extra attribution for such code, e.g. see here.
Speaking of feat_web
, your pull request and work should not be impacted by it. I'll do the work to pull your change into feat_web
and also sort out the new way that we will be handling the tests :-)
Great, thanks very much @chryswoods, and thanks for the comments.
Apologies for the delay with this @fjclark. I'll take a look on a local copy to see if I can resolve the conflicts and apply any 2023 related updates. I'm a bit confused why this would revert certain changes, i.e. those in the CHANGELOG
, but I guess this is to do with the point at which your fork was made.
No problem at all @lohedges. Brilliant, thank you. Yes, I don't remember any conflicts at the time I originally made the PR.
Hi @fjclark. I've done the work to update your scripts for the 2023 API and have also dealt with the various conflicts. This has been pushed to the feature-boresch branch. Could you take a look at this and let me know when you are happy?
Hi @lohedges, thanks very much for this - looks good. A couple of small comments:
Otherwise I'm happy.
Cheers.
No problem, I'll add these tomorrow. I must have missed them when updating. (I had to manually edit certain files because of the conflicts.)
Perfect, thanks.
Closed as incorporated via b9ef695.
Hello,
I've implemented Boresch restraints for ABFE calculations, trying to follow the implementation of the distance restraints as closely as possible. I've also implemented the analytical correction (Equation 32 of the paper) and semi-analytical correction for releasing these restraints to the standard state. The code for the latter is very closely based on restraints.py in Yank - I have acknowledged this, and my understanding is that this is fine due to the compatibility of the MIT and GNU GPL licenses.
This allows ABFE calculations with Boresch restraints to be run in three stages:
boresch_analytical_correction -C ../input/sim.cfg