[Cdk-commits] CVS: cdk/src/org/openscience/cdk/ringsearch AllRingsFinder.java,1.3,1.4 SSSRFinder.java,1.2,1.3

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/ringsearch
In directory usw-pr-cvs1:/tmp/cvs-serv31113/org/openscience/cdk/ringsearch

Modified Files:
	AllRingsFinder.java SSSRFinder.java 
Log Message:
Resolved getDegree() vs. getBondCOunt() issue. The latter is
chosen as there were more instances of those. (fixes bug #594515).


Index: AllRingsFinder.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/ringsearch/AllRingsFinder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AllRingsFinder.java	4 Aug 2002 12:25:47 -0000	1.3
--- AllRingsFinder.java	24 Aug 2002 15:03:54 -0000	1.4
***************
*** 102,106 ****
  			{
  				atom = (Atom)e.nextElement();
! 				if (ac.getDegree(atom) == 1)
  				{
  					ac.removeAtomAndConnectedBonds(atom);
--- 102,106 ----
  			{
  				atom = (Atom)e.nextElement();
! 				if (ac.getBondCount(atom) == 1)
  				{
  					ac.removeAtomAndConnectedBonds(atom);
***************
*** 221,225 ****
  		{
  			atom = ac.getAtomAt(f);
! 			degree = ac.getDegree(atom);
  			
  			if (degree < minDegree)
--- 221,225 ----
  		{
  			atom = ac.getAtomAt(f);
! 			degree = ac.getBondCount(atom);
  			
  			if (degree < minDegree)

Index: SSSRFinder.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/ringsearch/SSSRFinder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SSSRFinder.java	4 Aug 2002 12:25:47 -0000	1.2
--- SSSRFinder.java	24 Aug 2002 15:03:54 -0000	1.3
***************
*** 95,99 ****
  			{
  				Atom atom = molecule.getAtomAt(f);
! 				degree = molecule.getDegree(atom);
  				if (degree == 0)
  				{
--- 95,99 ----
  			{
  				Atom atom = molecule.getAtomAt(f);
! 				degree = molecule.getBondCount(atom);
  				if (degree == 0)
  				{