More fingerprints need the getFingerprint comptability method.

cdk · Apr 1, 2017 · fe745dc · fe745dc
1 parent 257fccc
commit fe745dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...ptor/fingerprint/src/main/java/org/openscience/cdk/fingerprint/ExtendedFingerprinter.java b/...ptor/fingerprint/src/main/java/org/openscience/cdk/fingerprint/ExtendedFingerprinter.java
@@ -46,7 +46,7 @@
  *
  * @see            org.openscience.cdk.fingerprint.Fingerprinter
  */
-public class ExtendedFingerprinter implements IFingerprinter {
+public class ExtendedFingerprinter extends Fingerprinter implements IFingerprinter {
 
     private final int     RESERVED_BITS = 25;
 

diff --git a/.../fingerprint/src/main/java/org/openscience/cdk/fingerprint/ShortestPathFingerprinter.java b/.../fingerprint/src/main/java/org/openscience/cdk/fingerprint/ShortestPathFingerprinter.java
@@ -80,7 +80,7 @@
  * @cdk.githash
  *
  */
-public class ShortestPathFingerprinter extends RandomNumber implements IFingerprinter, Serializable {
+public class ShortestPathFingerprinter extends AbstractFingerprinter implements IFingerprinter, Serializable {
 
     /**
      * The default length of created fingerprints.
@@ -94,6 +94,8 @@ public class ShortestPathFingerprinter extends RandomNumber implements IFingerpr
     private static ILoggingTool logger           = LoggingToolFactory
                                                          .createLoggingTool(ShortestPathFingerprinter.class);
 
+    private final RandomNumber rand = new RandomNumber();
+
     /**
      * Creates a fingerprint generator of length
      * <code>DEFAULT_SIZE</code>
@@ -264,6 +266,6 @@ public ICountFingerprint getCountFingerprint(IAtomContainer iac) throws CDKExcep
      * Returns a random number for a given object
      */
     private int getRandomNumber(Integer hashValue) {
-        return generateMersenneTwisterRandomNumber(fingerprintLength, hashValue);
+        return rand.generateMersenneTwisterRandomNumber(fingerprintLength, hashValue);
     }
 }
diff --git a/.../fingerprint/src/main/java/org/openscience/cdk/fingerprint/SubstructureFingerprinter.java b/.../fingerprint/src/main/java/org/openscience/cdk/fingerprint/SubstructureFingerprinter.java
@@ -364,7 +364,7 @@
  * @cdk.module   fingerprint
  * @cdk.githash
  */
-public class SubstructureFingerprinter implements IFingerprinter {
+public class SubstructureFingerprinter extends AbstractFingerprinter implements IFingerprinter {
 
     private String[] smarts;