Skip to content

Commit

Permalink
Don’t actually partition the molecule - just count how many component…
Browse files Browse the repository at this point in the history
… there are.

Signed-off-by: Stephan Beisken <sbeisken@gmail.com>
Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
  • Loading branch information
johnmay authored and egonw committed Dec 18, 2013
1 parent c48b7da commit 2922be2
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/main/org/openscience/cdk/fingerprint/MACCSFingerprinter.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,13 @@
import org.openscience.cdk.CDKConstants;
import org.openscience.cdk.annotations.TestClass;
import org.openscience.cdk.annotations.TestMethod;
import org.openscience.cdk.aromaticity.Aromaticity;
import org.openscience.cdk.aromaticity.ElectronDonation;
import org.openscience.cdk.exception.CDKException;
import org.openscience.cdk.graph.ConnectedComponents;
import org.openscience.cdk.graph.ConnectivityChecker;
import org.openscience.cdk.graph.Cycles;
import org.openscience.cdk.graph.GraphUtil;
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.interfaces.IAtomContainerSet;
import org.openscience.cdk.interfaces.IBond;
Expand Down Expand Up @@ -160,9 +165,9 @@ public IBitFingerprint getBitFingerprint(IAtomContainer container)
}
}
// bit 166 (*).(*)
IAtomContainerSet part
= ConnectivityChecker.partitionIntoMolecules(container);
if (part.getAtomContainerCount() > 1) fp.set(165, true);
ConnectedComponents cc = new ConnectedComponents(GraphUtil.toAdjList(container));
if (cc.nComponents() > 1)
fp.set(165, true);


return new BitSetFingerprint(fp);
Expand Down

0 comments on commit 2922be2

Please sign in to comment.