[Cdk-commits] SF.net SVN: cdk: [10430] cdk-gpl/trunk/src

[<mig...@us...>]

Revision: 10430
          http://cdk.svn.sourceforge.net/cdk/?rev=10430&view=rev
Author:   miguelrojasch
Date:     2008-03-18 02:37:55 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Removed imports not used anymore.

Modified Paths:
--------------
    cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/EMCluster.java
    cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterSupervisedResample.java
    cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomize.java
    cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResample.java
    cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/KmeansCluster.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/modulesuites/MqsarwekaTests.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/DensityBasedClustererModelTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/EMClusterTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterSupervisedResampleTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomizeTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResampleTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/J48WModelTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/KmeansClusterTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/LinearRegressionWModelTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/MultilayerPerceptronModelTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/NaiveBayesModelTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/QSARWekaModelTests.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOModelTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOregModelTest.java
    cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SimpleLinearRegressionModelTest.java

Modified: cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/EMCluster.java
===================================================================
--- cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/EMCluster.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/EMCluster.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -28,15 +28,13 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 
-import weka.core.Instance;
-import weka.core.Instances;
-import weka.clusterers.ClusterEvaluation;
-import weka.clusterers.Clusterer;
-import weka.clusterers.EM;
-
 import org.openscience.cdk.libio.weka.Weka;
 import org.openscience.cdk.qsar.model.QSARModelException;
 
+import weka.clusterers.EM;
+import weka.core.Instance;
+import weka.core.Instances;
+
 /** 
  * EM assigns a probability distribution to each instance which indicates the probability of it 
  * belonging to each of the clusters by using Weka library. 

Modified: cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterSupervisedResample.java
===================================================================
--- cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterSupervisedResample.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterSupervisedResample.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -25,13 +25,12 @@
  */
 package org.openscience.cdk.qsar.model.weka;
 
+import org.openscience.cdk.libio.weka.Weka;
+
 import weka.core.Instance;
 import weka.core.Instances;
 import weka.filters.supervised.instance.Resample;
 
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-
 /** 
  * Produces a random subsample of a dataset using sampling with 
  * replacement by using Weka library. The original dataset must fit entirely in memory. 

Modified: cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomize.java
===================================================================
--- cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomize.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomize.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -25,13 +25,12 @@
  */
 package org.openscience.cdk.qsar.model.weka;
 
+import org.openscience.cdk.libio.weka.Weka;
+
 import weka.core.Instance;
 import weka.core.Instances;
 import weka.filters.unsupervised.instance.Randomize;
 
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-
 /** 
  * This filter randomly shuffles the order of instances passed through it. 
  * The random number generator is reset with the seed value whenever setInputFormat() is called. 

Modified: cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResample.java
===================================================================
--- cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResample.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResample.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -25,13 +25,12 @@
  */
 package org.openscience.cdk.qsar.model.weka;
 
+import org.openscience.cdk.libio.weka.Weka;
+
 import weka.core.Instance;
 import weka.core.Instances;
 import weka.filters.unsupervised.instance.Resample;
 
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-
 /** 
  * Produces a random subsample of a dataset using sampling with replacement. 
  * The original dataset must fit entirely in memory. The number of instances 

Modified: cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/KmeansCluster.java
===================================================================
--- cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/KmeansCluster.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/main/org/openscience/cdk/qsar/model/weka/KmeansCluster.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -28,14 +28,14 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 
-import weka.core.Instance;
-import weka.core.Instances;
-import weka.clusterers.ClusterEvaluation;
-import weka.clusterers.Clusterer;
-import weka.clusterers.SimpleKMeans;
 import org.openscience.cdk.libio.weka.Weka;
 import org.openscience.cdk.qsar.model.QSARModelException;
 
+import weka.clusterers.Clusterer;
+import weka.clusterers.SimpleKMeans;
+import weka.core.Instance;
+import weka.core.Instances;
+
 /** 
  * A clustering class that provides the k means Cluster
  * using Weka library.

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/modulesuites/MqsarwekaTests.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/modulesuites/MqsarwekaTests.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/modulesuites/MqsarwekaTests.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -1,9 +1,9 @@
-package org.openscience.cdk.test.modulesuites;
+package org.openscience.cdk.modulesuites;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.openscience.cdk.test.libio.weka.WekaTest;
+import org.openscience.cdk.libio.weka.WekaTest;
 
 /**
  * TestSuite that runs all the tests for the CDK reaction module.

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/DensityBasedClustererModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/DensityBasedClustererModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/DensityBasedClustererModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,17 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
-import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.DensityBasedClustererModel;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.openscience.cdk.test.CDKTestCase;
 
+import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.libio.weka.Weka;
+
 /**
  * TestSuite that runs a test for the DensityBasedClustererModel
  *

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/EMClusterTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/EMClusterTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/EMClusterTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,17 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
-import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.EMCluster;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.openscience.cdk.test.CDKTestCase;
 
+import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.libio.weka.Weka;
+
 /**
  * TestSuite that runs a test for the EMCluster
  *

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterSupervisedResampleTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterSupervisedResampleTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterSupervisedResampleTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,17 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
-import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.FilterSupervisedResample;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.openscience.cdk.test.CDKTestCase;
 
+import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.libio.weka.Weka;
+
 /**
  * TestSuite that runs a test for the FilterSupervisedResample
  *

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomizeTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomizeTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedRandomizeTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,17 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
-import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.FilterUnSupervisedRandomize;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.openscience.cdk.test.CDKTestCase;
 
+import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.libio.weka.Weka;
+
 /**
  * TestSuite that runs a test for the FilterUnSupervisedRandomize
  *

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResampleTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResampleTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/FilterUnSupervisedResampleTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,17 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
-import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.FilterUnSupervisedResample;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.openscience.cdk.test.CDKTestCase;
 
+import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.libio.weka.Weka;
+
 /**
  * TestSuite that runs a test for the FilterUnSupervisedResample
  *

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/J48WModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/J48WModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/J48WModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -22,15 +22,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
  */
 
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import org.openscience.cdk.CDKTestCase;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.libio.weka.Weka;
 import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.J48WModel;
-import org.openscience.cdk.test.CDKTestCase;
 
 /**
  * TestSuite that runs a test for the J48WModel

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/KmeansClusterTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/KmeansClusterTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/KmeansClusterTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,18 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
-import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.libio.weka.Weka;
-import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.KmeansCluster;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.openscience.cdk.test.CDKTestCase;
-import weka.clusterers.SimpleKMeans;
-import weka.clusterers.Clusterer;
 
+import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.libio.weka.Weka;
+
 /**
  * TestSuite that runs a test for the KmeansCluster
  *

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/LinearRegressionWModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/LinearRegressionWModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/LinearRegressionWModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -21,14 +21,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import org.openscience.cdk.CDKTestCase;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.LinearRegressionWModel;
-import org.openscience.cdk.test.CDKTestCase;
 
 /**
  * TestSuite that runs a test for the LinearRegressionWModel

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/MultilayerPerceptronModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/MultilayerPerceptronModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/MultilayerPerceptronModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,15 +23,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import org.openscience.cdk.CDKTestCase;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.libio.weka.Weka;
 import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.MultilayerPerceptronModel;
-import org.openscience.cdk.test.CDKTestCase;
 
 /**
  * TestSuite that runs a test for the MultilayerPerceptronModel

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/NaiveBayesModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/NaiveBayesModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/NaiveBayesModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,15 +23,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import org.openscience.cdk.CDKTestCase;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.libio.weka.Weka;
 import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.NaiveBayesModel;
-import org.openscience.cdk.test.CDKTestCase;
 
 /**
  * TestSuite that runs a test for the NaiveBayesModel

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/QSARWekaModelTests.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/QSARWekaModelTests.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/QSARWekaModelTests.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -31,7 +31,7 @@
 import org.openscience.cdk.libio.weka.Weka;
 import org.openscience.cdk.qsar.model.QSARModelException;
 import org.openscience.cdk.qsar.model.weka.SMOModel;
-import org.openscience.cdk.test.CDKTestCase;
+import org.openscience.cdk.CDKTestCase;
 
 /**
  * TestSuite that runs a test for the SMOModel

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOregModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOregModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SMOregModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,15 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import org.openscience.cdk.CDKTestCase;
 import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.libio.weka.Weka;
 import org.openscience.cdk.qsar.model.QSARModelException;
-import org.openscience.cdk.qsar.model.weka.SMOregModel;
-import org.openscience.cdk.test.CDKTestCase;
 
 /**
  * TestSuite that runs a test for the SMOregModel

Modified: cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SimpleLinearRegressionModelTest.java
===================================================================
--- cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SimpleLinearRegressionModelTest.java	2008-03-18 09:36:53 UTC (rev 10429)
+++ cdk-gpl/trunk/src/test/org/openscience/cdk/qsar/model/weka/SimpleLinearRegressionModelTest.java	2008-03-18 09:37:55 UTC (rev 10430)
@@ -23,14 +23,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package org.openscience.cdk.test.qsar.model.weka;
+package org.openscience.cdk.qsar.model.weka;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.qsar.model.QSARModelException;
 import org.openscience.cdk.qsar.model.weka.SimpleLinearRegressionModel;
-import org.openscience.cdk.test.CDKTestCase;
+import org.openscience.cdk.CDKTestCase;
 
 /**
  * TestSuite that runs a test for the SimpleLinearRegressionModel


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