From: Egon W. <eg...@us...> - 2004-03-03 14:06:48
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/isomorphism/matchers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18241/src/org/openscience/cdk/isomorphism/matchers Modified Files: OrderQueryBond.java Log Message: Enabled doing queries in the UniverselIsomorphismTester with QueryAtomContainer! :) Index: OrderQueryBond.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/isomorphism/matchers/OrderQueryBond.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OrderQueryBond.java 3 Mar 2004 13:09:28 -0000 1.2 +++ OrderQueryBond.java 3 Mar 2004 13:46:17 -0000 1.3 @@ -25,6 +25,7 @@ import org.openscience.cdk.Atom; import org.openscience.cdk.Bond; +import org.openscience.cdk.CDKConstants; /** * @cdk.module extra @@ -39,7 +40,13 @@ } public boolean matches(Bond bond) { - throw new AbstractMethodError("The QueryBond class did not implement this method"); + if (this.getOrder() == bond.getOrder()) { + // bond orders match + return true; + } else if (this.getFlag(CDKConstants.ISAROMATIC) && bond.getFlag(CDKConstants.ISAROMATIC)) { + // or both are aromatic + } // else + return false; }; public void setAtoms(Atom[] atoms) { |