Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Treating the energy members as public variables, and accessing them from multiple locations in the code is sloppy and difficult to maintain. The EnergyType variables should be made private and only modified/set by the CalcEn function of each move. This requires specifying one method signature for all the moves, instead of the current two formed approach.
Non-cbmc moves take a molecule index as the argument
CBMC moves pass a CBMC molecule object.
The molecule index can be used to retrieve a CBMC object, so it seems the molecule index should be passed to all methods as the argument, and CBMC moves can create/retrieve the CBMC molecule object internally.
Until this is finalized, this PR reverts the hacked together intraBonded terms.