From: <raj...@us...> - 2008-01-08 15:58:10
|
Revision: 9865 http://cdk.svn.sourceforge.net/cdk/?rev=9865&view=rev Author: rajarshi Date: 2008-01-08 07:58:00 -0800 (Tue, 08 Jan 2008) Log Message: ----------- Updated Javadocs and unit tests for the self-connected case Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/ringsearch/RingPartitioner.java trunk/cdk/src/org/openscience/cdk/test/ringsearch/RingPartitionerTest.java Modified: trunk/cdk/src/org/openscience/cdk/ringsearch/RingPartitioner.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/ringsearch/RingPartitioner.java 2008-01-08 15:55:16 UTC (rev 9864) +++ trunk/cdk/src/org/openscience/cdk/ringsearch/RingPartitioner.java 2008-01-08 15:58:00 UTC (rev 9865) @@ -43,6 +43,7 @@ * Atom, a Bond or three or more atoms with at least on other ring in the * RingSet are considered connected. * + * * @cdk.module standard * @cdk.svnrev $Revision$ */ @@ -59,8 +60,13 @@ /** * Partitions a RingSet into RingSets of connected rings. Rings which share * an Atom, a Bond or three or more atoms with at least on other ring in - * the RingSet are considered connected. + * the RingSet are considered connected. Thus molecules such as azulene and + * indole will return a List with 1 element. * + * Note that an isolated ring is considered to be <i>self-connect</i>. As a result + * a molecule such as biphenyl will result in a 2-element List being returned (each + * element corresponding to a phenyl ring). + * *@param ringSet The RingSet to be partitioned *@return A List of connected RingSets */ Modified: trunk/cdk/src/org/openscience/cdk/test/ringsearch/RingPartitionerTest.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/ringsearch/RingPartitionerTest.java 2008-01-08 15:55:16 UTC (rev 9864) +++ trunk/cdk/src/org/openscience/cdk/test/ringsearch/RingPartitionerTest.java 2008-01-08 15:58:00 UTC (rev 9865) @@ -81,7 +81,7 @@ sssrf = new SSSRFinder(biphenyl); ringSet = sssrf.findSSSR(); list = RingPartitioner.partitionRings(ringSet); - Assert.assertEquals(0, list.size()); + Assert.assertEquals(2, list.size()); IMolecule spiro = MoleculeFactory.makeSpiroRings(); sssrf = new SSSRFinder(spiro); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |