[Cdk-commits] SF.net SVN: cdk: [8517] trunk/cdk/src/org/openscience/cdk/qsar/descriptors/ molecular

[<sp...@us...>]

Revision: 8517
          http://svn.sourceforge.net/cdk/?rev=8517&view=rev
Author:   speleo3
Date:     2007-07-06 03:20:14 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
getDescriptorResultType() did return DoubleResult instead of DoubleArrayResult

Modified Paths:
--------------
    trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorCharge.java
    trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorMass.java
    trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java

Modified: trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorCharge.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorCharge.java	2007-07-05 13:58:34 UTC (rev 8516)
+++ trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorCharge.java	2007-07-06 10:20:14 UTC (rev 8517)
@@ -32,7 +32,6 @@
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
 import org.openscience.cdk.qsar.result.DoubleArrayResult;
-import org.openscience.cdk.qsar.result.DoubleResult;
 import org.openscience.cdk.qsar.result.IDescriptorResult;
 
 /**
@@ -122,7 +121,7 @@
     }
 
     public IDescriptorResult getDescriptorResultType() {
-        return new DoubleResult(0.0);
+        return new DoubleArrayResult();
     }
 
     public void setParameters(Object[] params) throws CDKException {

Modified: trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorMass.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorMass.java	2007-07-05 13:58:34 UTC (rev 8516)
+++ trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorMass.java	2007-07-06 10:20:14 UTC (rev 8517)
@@ -28,7 +28,6 @@
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
 import org.openscience.cdk.qsar.result.DoubleArrayResult;
-import org.openscience.cdk.qsar.result.DoubleResult;
 import org.openscience.cdk.qsar.result.IDescriptorResult;
 import org.openscience.cdk.tools.MFAnalyser;
 
@@ -138,7 +137,7 @@
 	}
 	
 	public IDescriptorResult getDescriptorResultType() {
-        return new DoubleResult(0.0);
+        return new DoubleArrayResult();
     }
 
 	public void setParameters(Object[] params) throws CDKException {

Modified: trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java	2007-07-05 13:58:34 UTC (rev 8516)
+++ trunk/cdk/src/org/openscience/cdk/qsar/descriptors/molecular/AutocorrelationDescriptorPolarizability.java	2007-07-06 10:20:14 UTC (rev 8517)
@@ -30,7 +30,6 @@
 import org.openscience.cdk.qsar.DescriptorValue;
 import org.openscience.cdk.qsar.IMolecularDescriptor;
 import org.openscience.cdk.qsar.result.DoubleArrayResult;
-import org.openscience.cdk.qsar.result.DoubleResult;
 import org.openscience.cdk.qsar.result.IDescriptorResult;
 
 /**
@@ -120,7 +119,7 @@
 	}
 	
 	public IDescriptorResult getDescriptorResultType() {
-        return new DoubleResult(0.0);
+        return new DoubleArrayResult();
     }
 
 	public void setParameters(Object[] params) throws CDKException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.