Adding abstract super class to all molecular descriptors.

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
cdk · Jul 31, 2013 · a097d37 · a097d37
1 parent 76d9f48
commit a097d37
Show file tree

Hide file tree

Showing 51 changed files with 102 additions and 52 deletions.
diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/ALOGPDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/ALOGPDescriptor.java
@@ -32,6 +32,7 @@
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IRing;
 import org.openscience.cdk.interfaces.IRingSet;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -93,7 +94,7 @@
  * @see org.openscience.cdk.aromaticity.CDKHueckelAromaticityDetector
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.ALOGPDescriptorTest")
-public class ALOGPDescriptor implements IMolecularDescriptor {
+public class ALOGPDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static ILoggingTool logger =
         LoggingToolFactory.createLoggingTool(ALOGPDescriptor.class);
 

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/APolDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/APolDescriptor.java
@@ -32,6 +32,7 @@
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IElement;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -74,7 +75,7 @@
  * @cdk.keyword polarizability, atomic
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.APolDescriptorTest")
-public class APolDescriptor implements IMolecularDescriptor {
+public class APolDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     private static ILoggingTool logger =
         LoggingToolFactory.createLoggingTool(APolDescriptor.class);

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/AcidicGroupCountDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/AcidicGroupCountDescriptor.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IChemObjectBuilder;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -49,7 +50,7 @@
  * @cdk.dictref qsar-descriptors:acidicGroupCount
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AcidicGroupCountDescriptorTest")
-public class AcidicGroupCountDescriptor implements IMolecularDescriptor {
+public class AcidicGroupCountDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     private final static String[] SMARTS_STRINGS = {
         "[$([O;H1]-[C,S,P]=O)]",

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/AminoAcidCountDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/AminoAcidCountDescriptor.java
@@ -30,6 +30,7 @@
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IAtomContainerSet;
 import org.openscience.cdk.isomorphism.UniversalIsomorphismTester;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -68,7 +69,7 @@
  * @cdk.dictref qsar-descriptors:aminoAcidsCount
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AminoAcidCountDescriptorTest")
-public class AminoAcidCountDescriptor implements IMolecularDescriptor {
+public class AminoAcidCountDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     private IAtomContainerSet substructureSet;
 

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/AromaticAtomsCountDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/AromaticAtomsCountDescriptor.java
@@ -30,6 +30,7 @@
 import org.openscience.cdk.aromaticity.CDKHueckelAromaticityDetector;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -64,7 +65,7 @@
  * @cdk.dictref qsar-descriptors:aromaticAtomsCount
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AromaticAtomsCountDescriptorTest")
-public class AromaticAtomsCountDescriptor implements IMolecularDescriptor {
+public class AromaticAtomsCountDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private boolean checkAromaticity = false;
     private static final String[] names = {"naAromAtom"};
 

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/AromaticBondsCountDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/AromaticBondsCountDescriptor.java
@@ -31,6 +31,7 @@
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -67,7 +68,7 @@
  * @cdk.dictref qsar-descriptors:aromaticBondsCount
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AromaticBondsCountDescriptorTest")
-public class AromaticBondsCountDescriptor implements IMolecularDescriptor {
+public class AromaticBondsCountDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private boolean checkAromaticity = false;
     private static final String[] names = {"nAromBond"};
 

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/AtomCountDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/AtomCountDescriptor.java
@@ -29,6 +29,7 @@
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -66,7 +67,7 @@
  * @cdk.dictref qsar-descriptors:atomCount
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AtomCountDescriptorTest")
-public class AtomCountDescriptor implements IMolecularDescriptor {
+public class AtomCountDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     private String elementName = "*";
 

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorCharge.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorCharge.java
@@ -29,6 +29,7 @@
 import org.openscience.cdk.graph.matrix.TopologicalMatrix;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -50,7 +51,7 @@
  */
 
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AutocorrelationDescriptorChargeTest")
-public class AutocorrelationDescriptorCharge implements IMolecularDescriptor{
+public class AutocorrelationDescriptorCharge extends AbstractMolecularDescriptor implements IMolecularDescriptor{
 
     private static final String[] names = {"ATSc1", "ATSc2", "ATSc3", "ATSc4", "ATSc5"};
     private static double[] listcharges (IAtomContainer container)throws CDKException{

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorMass.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorMass.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.graph.matrix.TopologicalMatrix;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IElement;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -46,7 +47,7 @@
  * @cdk.set     qsar-descriptors
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AutocorrelationDescriptorMassTest")
-public class AutocorrelationDescriptorMass implements IMolecularDescriptor{
+public class AutocorrelationDescriptorMass extends AbstractMolecularDescriptor implements IMolecularDescriptor{
 
     private final static String[] names = {"ATSm1", "ATSm2", "ATSm3", "ATSm4", "ATSm5"};
     private final static double CARBON_MASS = 12.010735896788;

diff --git a/...g/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java b/...g/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java
@@ -32,6 +32,7 @@
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IAtomType;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -56,7 +57,7 @@
  */
 
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.AutocorrelationDescriptorPolarizabilityTest")
-public class AutocorrelationDescriptorPolarizability implements IMolecularDescriptor {
+public class AutocorrelationDescriptorPolarizability extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     private static final String[] names = {"ATSp1", "ATSp2", "ATSp3", "ATSp4", "ATSp5"};
     private static double[] listpolarizability(IAtomContainer container, int[][] dmat) throws CDKException {

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/BCUTDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/BCUTDescriptor.java
@@ -38,6 +38,7 @@
 import org.openscience.cdk.graph.matrix.AdjacencyMatrix;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -124,7 +125,7 @@
  * @cdk.keyword descriptor
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.BCUTDescriptorTest")
-public class BCUTDescriptor implements IMolecularDescriptor {
+public class BCUTDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static ILoggingTool logger =
             LoggingToolFactory.createLoggingTool(BCUTDescriptor.class);
 

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/BPolDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/BPolDescriptor.java
@@ -33,6 +33,7 @@
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IElement;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -72,7 +73,7 @@
  * @cdk.dictref qsar-descriptors:bpol
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.BPolDescriptorTest")
-public class BPolDescriptor implements IMolecularDescriptor {
+public class BPolDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static ILoggingTool logger =
         LoggingToolFactory.createLoggingTool(BPolDescriptor.class);
     /* Atomic polarizabilities ordered by atomic number from 1 to 102. */

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/BasicGroupCountDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/BasicGroupCountDescriptor.java
@@ -26,6 +26,7 @@
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IChemObjectBuilder;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -48,7 +49,7 @@
  * @cdk.dictref qsar-descriptors:acidicGroupCount
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.BasicGroupCountDescriptorTest")
-public class BasicGroupCountDescriptor implements IMolecularDescriptor {
+public class BasicGroupCountDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     private final static String[] SMARTS_STRINGS = {
         "[$([NH2]-[CX4])]", "[$([NH](-[CX4])-[CX4])]",

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/BondCountDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/BondCountDescriptor.java
@@ -26,6 +26,7 @@
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IBond.Order;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -68,7 +69,7 @@
  * @cdk.dictref qsar-descriptors:bondCount
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.BondCountDescriptorTest")
-public class BondCountDescriptor implements IMolecularDescriptor {
+public class BondCountDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
 	/** defaults to UNSET, which means: count all bonds **/
     private String order = "";

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/CPSADescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/CPSADescriptor.java
@@ -26,6 +26,7 @@
 import org.openscience.cdk.geometry.GeometryTools;
 import org.openscience.cdk.geometry.surface.NumericalSurface;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -138,7 +139,7 @@
  * @cdk.dictref qsar-descriptors:CPSA
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.CPSADescriptorTest")
-public class CPSADescriptor implements IMolecularDescriptor {
+public class CPSADescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     private static final String[] names = {
             "PPSA-1", "PPSA-2", "PPSA-3",

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/CarbonTypesDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/CarbonTypesDescriptor.java
@@ -28,6 +28,7 @@
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -75,7 +76,7 @@
  * @cdk.keyword descriptor
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.CarbonTypesDescriptorTest")
-public class CarbonTypesDescriptor implements IMolecularDescriptor {
+public class CarbonTypesDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
 
     private final static String[] names = {

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiChainDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiChainDescriptor.java
@@ -33,6 +33,7 @@
 import org.openscience.cdk.interfaces.IRingSet;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainer;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainerCreator;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -85,7 +86,7 @@
  * @cdk.keyword descriptor
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.ChiChainDescriptorTest")
-public class ChiChainDescriptor implements IMolecularDescriptor {
+public class ChiChainDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static ILoggingTool logger =
         LoggingToolFactory.createLoggingTool(ChiChainDescriptor.class);
     private SmilesParser sp;

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiClusterDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiClusterDescriptor.java
@@ -31,6 +31,7 @@
 import org.openscience.cdk.interfaces.IAtomType;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainer;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainerCreator;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -79,7 +80,7 @@
  * @cdk.keyword descriptor
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.ChiClusterDescriptorTest")
-public class ChiClusterDescriptor implements IMolecularDescriptor {
+public class ChiClusterDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static ILoggingTool logger =
         LoggingToolFactory.createLoggingTool(ChiClusterDescriptor.class);
     private SmilesParser sp;

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiPathClusterDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiPathClusterDescriptor.java
@@ -31,6 +31,7 @@
 import org.openscience.cdk.interfaces.IAtomType;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainer;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainerCreator;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -78,7 +79,7 @@
  * @cdk.keyword descriptor
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.ChiPathClusterDescriptorTest")
-public class ChiPathClusterDescriptor implements IMolecularDescriptor {
+public class ChiPathClusterDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static ILoggingTool logger =
         LoggingToolFactory.createLoggingTool(ChiPathClusterDescriptor.class);
     private SmilesParser sp;

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiPathDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/ChiPathDescriptor.java
@@ -33,6 +33,7 @@
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainer;
 import org.openscience.cdk.isomorphism.matchers.QueryAtomContainerCreator;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -73,7 +74,7 @@
  * @cdk.keyword descriptor
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.ChiPathDescriptorTest")
-public class ChiPathDescriptor implements IMolecularDescriptor {
+public class ChiPathDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private SmilesParser sp;
 
     public ChiPathDescriptor() {

diff --git a/.../org/openscience/cdk/qsar/descriptors/molecular/EccentricConnectivityIndexDescriptor.java b/.../org/openscience/cdk/qsar/descriptors/molecular/EccentricConnectivityIndexDescriptor.java
@@ -25,6 +25,7 @@
 import org.openscience.cdk.graph.PathTools;
 import org.openscience.cdk.graph.matrix.AdjacencyMatrix;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -71,7 +72,7 @@
  * @cdk.dictref qsar-descriptors:eccentricConnectivityIndex
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.EccentricConnectivityIndexDescriptorTest")
-public class EccentricConnectivityIndexDescriptor implements IMolecularDescriptor {
+public class EccentricConnectivityIndexDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static final String[] names = {"ECCEN"};
 
     public EccentricConnectivityIndexDescriptor() {}

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/FMFDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/FMFDescriptor.java
@@ -25,6 +25,7 @@
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.fragment.MurckoFragmenter;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -54,7 +55,7 @@
  * @see org.openscience.cdk.fragment.MurckoFragmenter
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.FMFDescriptorTest")
-public class FMFDescriptor implements IMolecularDescriptor {
+public class FMFDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
 
     public FMFDescriptor() {
     }

diff --git a/src/main/org/openscience/cdk/qsar/descriptors/molecular/FragmentComplexityDescriptor.java b/src/main/org/openscience/cdk/qsar/descriptors/molecular/FragmentComplexityDescriptor.java
@@ -22,6 +22,7 @@
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.qsar.AbstractMolecularDescriptor;
 import org.openscience.cdk.qsar.DescriptorSpecification;
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
@@ -46,7 +47,7 @@
  * @cdk.dictref qsar-descriptors:NilaComplexity
  */
 @TestClass("org.openscience.cdk.qsar.descriptors.molecular.FragmentComplexityDescriptorTest")
-public class FragmentComplexityDescriptor implements IMolecularDescriptor {
+public class FragmentComplexityDescriptor extends AbstractMolecularDescriptor implements IMolecularDescriptor {
     private static final String[] names = {"fragC"};