Refactored code using some boolean convenience functions to improve code... #57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| } | ||
| counter++; | ||
| if (isHeavyAtom(chain.getAtom(i))) { | ||
| if (!chain.getAtom(i).getFlag(CDKConstants.VISITED)) { |
There was a problem hiding this comment.
Okay - but PMD warns on
if(bool){
if(bool){
} // no else
}
There was a problem hiding this comment.
I expected that - I split the test from one into two so that I could apply one of my methods, and to disentangle what was going on in the if-statement. Now that I've figured it out, I'll probably recombine these two ifs.
From: John May
Sent: Tuesday, September 02, 2014 8:11 PM
To: cdk/cdk
Cc: mbv31602
Subject: Re: [cdk] Refactored code using some boolean convenience functions to improve code... (#57)
In tool/builder3d/src/main/java/org/openscience/cdk/modeling/builder3d/AtomPlacer3D.java:
try{if (getDoubleBondConfiguration2D( molecule.getBond(molecule.getAtom(first_atoms[counter-1]),molecule.getAtom(first_atoms[counter-2])),(molecule.getAtom(first_atoms[counter])).getPoint2d(),(molecule.getAtom(first_atoms[counter-1])).getPoint2d(),(molecule.getAtom(first_atoms[counter-2])).getPoint2d(),(molecule.getAtom(first_atoms[counter-3])).getPoint2d())==5){dihedrals[counter] = DIHEDRAL_BRANCHED_CHAIN;}else{ dihedrals[counter] = DIHEDRAL_EXTENDED_CHAIN;}}catch(CDKException ex1){dihedrals[counter] = DIHEDRAL_EXTENDED_CHAIN;}} else {dihedrals[counter] = -1;}counter++;if (isHeavyAtom(chain.getAtom(i))) {if (!chain.getAtom(i).getFlag(CDKConstants.VISITED)) {
if(bool){
if(bool){
} // no else
}
—
Reply to this email directly or view it on GitHub.
|
All good - applied and pushed. Thanks. J |
ghost
deleted the
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
... readability.
I'll add a second patch containing only reformatting once this patch has been accepted, to clean up the formatting problems encountered on the previous patch.