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

Patch/reorg 12 feb17 #268

Merged
merged 14 commits into from Feb 14, 2017
Merged

Patch/reorg 12 feb17 #268

merged 14 commits into from Feb 14, 2017

Conversation

johnmay
Copy link
Member

@johnmay johnmay commented Feb 14, 2017

First batch of reorganisations and spring cleaning.

API Changes
There are some API changes here in terms of where classes are located (in which module) which I feel are acceptable as including cdk-bundle will still allow compilation.

I did move and encapsulate the MathTools class as this was only used by a specific class and should not have been public in the first place. Again I feel this change is acceptable, as a rule of thumb I would say "is it chemistry related? Should or could someone expect to be calling this method". Ideally I would encapsulate the EStateFragments class as well but I feel this could be used externally.

Deprecation
I've added some more deprecation warnings to old classes.

…nd libiocml... so for now we need to put it in io.
…ue it is more efficient to use SMILES (or even InChI with FixedH). To map the atom correspondence to the InChI we still have to fall back to substructure matching but the correct approach of using the AuxInfo can also be used.
… in. We can't remove the old method that forces slow execution but it has now be deprecated. New tests added to demonstrate correct exectution.
…ate, a simple update would not be sufficient due to API differences.
…to make cdk-qsarmolecular depend on the fingerprint module which is reasonable since fingerprints are a molecular descriptor.
Copy link
Member

@egonw egonw left a comment

Choose a reason for hiding this comment

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

Generally looks fine. Can you fix the USA/U typo's?

*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
Copy link
Member

Choose a reason for hiding this comment

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

Typo.

Copy link
Member Author

Choose a reason for hiding this comment

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

Odd not sure where there came from.

*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
Copy link
Member

Choose a reason for hiding this comment

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

Typo.

*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
Copy link
Member

Choose a reason for hiding this comment

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

More Typo :)

import org.openscience.cdk.silent.Atom;
import org.openscience.cdk.silent.AtomContainer;
import org.openscience.cdk.silent.Bond;
import org.openscience.cdk.silent.SilentChemObjectBuilder;
Copy link
Member

Choose a reason for hiding this comment

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

Mmm... it was using that, so not a request to fix it... but I should have another round of making things independent from implementation classes :)

Copy link
Member Author

Choose a reason for hiding this comment

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

I actually disagree with that design in general, but regardless in this case it is
a) in a test class (i.e. it is already decoupled)
b) deprecated

Copy link
Member

Choose a reason for hiding this comment

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

(yes, tests actually are fine... actually, I find it hard to see in which file changes are in the web gui... overlooked that; but this was not a change request in the first place...)

@johnmay
Copy link
Member Author

johnmay commented Feb 14, 2017

Fixed

@egonw egonw merged commit c3f55ae into master Feb 14, 2017
@johnmay johnmay deleted the patch/reorg_12Feb17 branch June 17, 2017 10:16
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

2 participants