From: Egon W. <eg...@us...> - 2004-11-22 15:15:20
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31576/src/org/openscience/cdk/qsar Modified Files: AtomCountDescriptor.java Log Message: Also implemented the other methods Index: AtomCountDescriptor.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/qsar/AtomCountDescriptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AtomCountDescriptor.java 22 Nov 2004 15:03:57 -0000 1.1 +++ AtomCountDescriptor.java 22 Nov 2004 15:15:10 -0000 1.2 @@ -54,8 +54,12 @@ // ok, all should be fine elementName = (String)params[0]; } + public Object[] getParameters() { - return null; // FIXME!!! + // return the parameters as used for the descriptor calculation + Object[] params = new Object[1]; + params[0] = elementName; + return params; } public Object calculate(AtomContainer container) { @@ -69,9 +73,15 @@ return new Integer(atomCount); } - // we should also have something like these. The order of the String[] - // return should match the expected order in setParameters; - public String[] getParameterNames() {return null; /* FIXME */ }; - public Object getParameterType(String name) {return null; /* FIXME */ }; + public String[] getParameterNames() { + String[] params = new String[1]; + params[0] = "Element Symbol"; + return params; + }; + public Object getParameterType(String name) { + Object[] paramTypes = new Object[1]; + paramTypes[0] = new String(); + return paramTypes; + }; } |