From 24efb577ca41516c68e3150c3f468cb07e68d485 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Wed, 3 Feb 2010 10:45:26 +0000
Subject: [PATCH] Fix import paths that where broken in last commit.
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
git-svn-id: https://scikit-learn.svn.sourceforge.net/svnroot/scikit-learn/trunk@399 22fbfee3-77ab-4535-9bad-27d1bd3bc7d8
---
README | 2 +-
doc/sphinxext/numpydoc.py | 4 ++--
scikits/learn/em/examples/basic_example1.py | 2 +-
scikits/learn/em/examples/basic_example2.py | 2 +-
scikits/learn/em/examples/basic_example3.py | 2 +-
scikits/learn/em/examples/discriminant_analysis.py | 2 +-
scikits/learn/em/examples/expectation.py | 2 +-
scikits/learn/em/examples/pdfestimation.py | 2 +-
scikits/learn/em/examples/pdfestimation1d.py | 2 +-
scikits/learn/em/examples/plotexamples.py | 2 +-
scikits/learn/em/examples/regularized_example.py | 4 ++--
scikits/learn/em/tests/generate_tests_data.py | 2 +-
scikits/learn/em/tests/test_densities.py | 4 ++--
scikits/learn/em/tests/test_examples.py | 2 +-
scikits/learn/em/tests/test_gauss_mix.py | 4 ++--
scikits/learn/em/tests/test_gmm_em.py | 4 ++--
scikits/learn/em/tests/test_online_em.py | 4 ++--
scikits/learn/manifold/examples/compression.py | 4 ++--
scikits/learn/manifold/examples/knn.py | 2 +-
scikits/learn/manifold/examples/knn2.py | 2 +-
scikits/learn/manifold/examples/projection.py | 4 ++--
scikits/learn/manifold/examples/regression.py | 4 ++--
scikits/learn/manifold/regression/PLMR.py | 2 +-
scikits/learn/manifold/setup.py | 2 +-
scikits/learn/setup.py | 2 +-
scikits/learn/svm/examples/classification.py | 2 +-
scikits/learn/svm/examples/classification2.py | 2 +-
27 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/README b/README
index 921c0f4487..8c97efac49 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ The required dependencies to build the software are python >= 2.5,
NumPy >= 1.1, SciPy, the Boost libraries and a working C++ compiler.
Optional dependencies are scikits.optimization for module
-machine.manifold_learning.
+machine.manifold.
To run the tests you will also need nosetests and python-dap
(http://pypi.python.org/pypi/dap/).
diff --git a/doc/sphinxext/numpydoc.py b/doc/sphinxext/numpydoc.py
index 06c4523ec2..4416a1a17e 100644
--- a/doc/sphinxext/numpydoc.py
+++ b/doc/sphinxext/numpydoc.py
@@ -121,7 +121,7 @@ def setup(app, get_doc_object_=get_doc_object):
#------------------------------------------------------------------------------
# Input-mangling directives
#------------------------------------------------------------------------------
-from docutils.statemachine import ViewList
+from docutils.stateimport ViewList
def get_directive(name):
from docutils.parsers.rst import directives
@@ -150,7 +150,7 @@ def wrap_mangling_directive(base_directive_name, objtype):
return base_func(self.name, self.arguments, self.options,
self.content, self.lineno,
self.content_offset, self.block_text,
- self.state, self.state_machine)
+ self.state, self.state_
class directive(base_directive):
def run(self):
diff --git a/scikits/learn/em/examples/basic_example1.py b/scikits/learn/em/examples/basic_example1.py
index 5f9a101e70..3b32fff118 100644
--- a/scikits/learn/em/examples/basic_example1.py
+++ b/scikits/learn/em/examples/basic_example1.py
@@ -1,6 +1,6 @@
import numpy as N
import pylab as P
-from scikits.learn.machine.em import GM
+from scikits.learn.em import GM
#------------------------------
# Hyper parameters:
diff --git a/scikits/learn/em/examples/basic_example2.py b/scikits/learn/em/examples/basic_example2.py
index a42ee14eeb..941570c8e4 100644
--- a/scikits/learn/em/examples/basic_example2.py
+++ b/scikits/learn/em/examples/basic_example2.py
@@ -1,6 +1,6 @@
from numpy.random import seed
-from scikits.learn.machine.em import GM, GMM, EM
+from scikits.learn.em import GM, GMM, EM
import copy
# To reproduce results, fix the random seed
diff --git a/scikits/learn/em/examples/basic_example3.py b/scikits/learn/em/examples/basic_example3.py
index fe767068ba..11c19f1502 100644
--- a/scikits/learn/em/examples/basic_example3.py
+++ b/scikits/learn/em/examples/basic_example3.py
@@ -1,7 +1,7 @@
import numpy as N
from numpy.random import seed
-from scikits.learn.machine.em import GM, GMM, EM
+from scikits.learn.em import GM, GMM, EM
import copy
seed(2)
diff --git a/scikits/learn/em/examples/discriminant_analysis.py b/scikits/learn/em/examples/discriminant_analysis.py
index 31ba5bbef8..69f59747b0 100644
--- a/scikits/learn/em/examples/discriminant_analysis.py
+++ b/scikits/learn/em/examples/discriminant_analysis.py
@@ -13,7 +13,7 @@ import numpy as N
import pylab as P
import matplotlib as MPL
-from scikits.learn.machine.em import EM, GMM, GM
+from scikits.learn.em import EM, GMM, GM
import utils
data = utils.iris.load()
diff --git a/scikits/learn/em/examples/expectation.py b/scikits/learn/em/examples/expectation.py
index a051cc9001..274fc0b242 100644
--- a/scikits/learn/em/examples/expectation.py
+++ b/scikits/learn/em/examples/expectation.py
@@ -4,7 +4,7 @@ Expectation maximation example
import pylab
import numpy as np
-from scikits.learn.machine.em.densities2 import gauss_ell
+from scikits.learn.em.densities2 import gauss_ell
#=========================================
# Test plotting a simple diag 2d variance:
diff --git a/scikits/learn/em/examples/pdfestimation.py b/scikits/learn/em/examples/pdfestimation.py
index 360f5fac84..3fd33d3568 100644
--- a/scikits/learn/em/examples/pdfestimation.py
+++ b/scikits/learn/em/examples/pdfestimation.py
@@ -5,7 +5,7 @@
import numpy as N
import pylab as P
-from scikits.learn.machine.em import EM, GM, GMM
+from scikits.learn.em import EM, GM, GMM
import utils
oldfaithful = utils.get_faithful()
diff --git a/scikits/learn/em/examples/pdfestimation1d.py b/scikits/learn/em/examples/pdfestimation1d.py
index 71d34b2233..981236afa6 100644
--- a/scikits/learn/em/examples/pdfestimation1d.py
+++ b/scikits/learn/em/examples/pdfestimation1d.py
@@ -14,7 +14,7 @@ import numpy as N
import pylab as P
import matplotlib as MPL
-from scikits.learn.machine.em import EM, GM, GMM
+from scikits.learn.em import EM, GM, GMM
import utils
oldfaithful = utils.get_faithful()
diff --git a/scikits/learn/em/examples/plotexamples.py b/scikits/learn/em/examples/plotexamples.py
index 7751eee2cc..af4adc5e5e 100644
--- a/scikits/learn/em/examples/plotexamples.py
+++ b/scikits/learn/em/examples/plotexamples.py
@@ -7,7 +7,7 @@ import numpy as N
import pylab as P
-from scikits.learn.machine.em import EM, GM, GMM
+from scikits.learn.em import EM, GM, GMM
# Generate a simple mixture model, plot its confidence ellipses + isodensity
# curves for both diagonal and full covariance matrices
diff --git a/scikits/learn/em/examples/regularized_example.py b/scikits/learn/em/examples/regularized_example.py
index 0c9e8c91f8..a7e23c12c0 100644
--- a/scikits/learn/em/examples/regularized_example.py
+++ b/scikits/learn/em/examples/regularized_example.py
@@ -16,9 +16,9 @@ you need to avoid singular covariance matrices."""
import numpy as N
import pylab as P
-from scikits.learn.machine.em import EM, GM, GMM
+from scikits.learn.em import EM, GM, GMM
# Experimental RegularizedEM
-from scikits.learn.machine.em.gmm_em import RegularizedEM
+from scikits.learn.em.gmm_em import RegularizedEM
import utils
x, y = utils.get_pendigits()
diff --git a/scikits/learn/em/tests/generate_tests_data.py b/scikits/learn/em/tests/generate_tests_data.py
index e43eccd856..302f4448ae 100644
--- a/scikits/learn/em/tests/generate_tests_data.py
+++ b/scikits/learn/em/tests/generate_tests_data.py
@@ -6,7 +6,7 @@ import copy
import numpy as N
from scipy.io import savemat, loadmat
-from scikits.learn.machine.em import GM, GMM, EM
+from scikits.learn.em import GM, GMM, EM
def generate_dataset(d, k, mode, nframes):
"""Generate a dataset useful for EM anf GMM testing.
diff --git a/scikits/learn/em/tests/test_densities.py b/scikits/learn/em/tests/test_densities.py
index f4a898af16..8388521800 100644
--- a/scikits/learn/em/tests/test_densities.py
+++ b/scikits/learn/em/tests/test_densities.py
@@ -12,10 +12,10 @@ from unittest import TestCase
import numpy as N
from numpy.testing import assert_array_almost_equal, assert_array_equal
-from scikits.learn.machine.em.densities import gauss_den, \
+from scikits.learn.em.densities import gauss_den, \
multiple_gauss_den, logsumexp, gauss_ell
-from scikits.learn.machine.em.tests.testcommon import DEF_DEC
+from scikits.learn.em.tests.testcommon import DEF_DEC
class TestDensities(TestCase):
def _generate_test_data_1d(self):
diff --git a/scikits/learn/em/tests/test_examples.py b/scikits/learn/em/tests/test_examples.py
index a55d74350b..56061b3726 100644
--- a/scikits/learn/em/tests/test_examples.py
+++ b/scikits/learn/em/tests/test_examples.py
@@ -3,7 +3,7 @@
from unittest import TestCase
-from scikits.learn.machine.em.examples.examples import ex1, ex2, ex3, pdfestim, pdfestim1d
+from scikits.learn.em.examples.examples import ex1, ex2, ex3, pdfestim, pdfestim1d
class test_examples(TestCase):
def test_ex1(self, level = 3):
diff --git a/scikits/learn/em/tests/test_gauss_mix.py b/scikits/learn/em/tests/test_gauss_mix.py
index 3b808bea6f..a6860de9e4 100644
--- a/scikits/learn/em/tests/test_gauss_mix.py
+++ b/scikits/learn/em/tests/test_gauss_mix.py
@@ -9,8 +9,8 @@ from unittest import TestCase
import numpy as N
from numpy.testing import assert_array_almost_equal
-from scikits.learn.machine.em import GM
-from scikits.learn.machine.em.densities import multiple_gauss_den
+from scikits.learn.em import GM
+from scikits.learn.em.densities import multiple_gauss_den
class test_BasicFunc(TestCase):
"""Check that basic functionalities work."""
diff --git a/scikits/learn/em/tests/test_gmm_em.py b/scikits/learn/em/tests/test_gmm_em.py
index ae6b524f63..9dbfb809db 100644
--- a/scikits/learn/em/tests/test_gmm_em.py
+++ b/scikits/learn/em/tests/test_gmm_em.py
@@ -10,9 +10,9 @@ from unittest import TestCase
import numpy as N
from numpy.testing import assert_array_almost_equal
-from scikits.learn.machine.em import GMM, GM, EM
+from scikits.learn.em import GMM, GM, EM
-from scikits.learn.machine.em.tests.testcommon import DEF_DEC
+from scikits.learn.em.tests.testcommon import DEF_DEC
curpath = os.path.dirname(__file__)
diff --git a/scikits/learn/em/tests/test_online_em.py b/scikits/learn/em/tests/test_online_em.py
index de8db20895..770d37b57b 100644
--- a/scikits/learn/em/tests/test_online_em.py
+++ b/scikits/learn/em/tests/test_online_em.py
@@ -9,8 +9,8 @@ from unittest import TestCase
import numpy as N
from numpy.random import seed
-from scikits.learn.machine.em import GM, GMM
-from scikits.learn.machine.em.online_em import OnGMM, OnGMM1d
+from scikits.learn.em import GM, GMM
+from scikits.learn.em.online_em import OnGMM, OnGMM1d
# #Optional:
# set_local_path()
diff --git a/scikits/learn/manifold/examples/compression.py b/scikits/learn/manifold/examples/compression.py
index ff7cd3c671..c6978a0df7 100644
--- a/scikits/learn/manifold/examples/compression.py
+++ b/scikits/learn/manifold/examples/compression.py
@@ -8,7 +8,7 @@ Options:
Usage:
compression.py [compressionkind [datafile [compresseddatafile]]]
- - compressionkind is one of the compression in scikits.learn.machine.manifold_learning.compression (isomap, LLE, ...)
+ - compressionkind is one of the compression in scikits.learn.manifold.compression (isomap, LLE, ...)
- datafile is the data file to compress (default = swissroll.pickled)
- compresseddatafile is the output file (default = swissroll.compressed.pickled)
"""
@@ -17,7 +17,7 @@ import sys
import pickle
import numpy
-from scikits.learn.machine.manifold_learning import compression
+from scikits.learn.manifold import compression
if len(sys.argv) > 1:
if sys.argv[1] == "-h":
diff --git a/scikits/learn/manifold/examples/knn.py b/scikits/learn/manifold/examples/knn.py
index a834f18dd0..ecfc1a0169 100644
--- a/scikits/learn/manifold/examples/knn.py
+++ b/scikits/learn/manifold/examples/knn.py
@@ -1,6 +1,6 @@
import numpy as np
import matplotlib.pyplot as plt
-from scikits.learn.machine.manifold_learning.regression.neighbors import \
+from scikits.learn.manifold.regression.neighbors import \
Neighbors, Kneighbors, Parzen
n = 100 # number of points
diff --git a/scikits/learn/manifold/examples/knn2.py b/scikits/learn/manifold/examples/knn2.py
index a3abf4ae60..09295537ad 100644
--- a/scikits/learn/manifold/examples/knn2.py
+++ b/scikits/learn/manifold/examples/knn2.py
@@ -4,7 +4,7 @@ Demo using k-Nearest Neighbor Algorithm
import numpy as np
-from scikits.learn.machine.manifold_learning.regression.neighbors import \
+from scikits.learn.manifold.regression.neighbors import \
Neighbors, Kneighbors, Parzen
points = np.array([[0., 0., 0.],
diff --git a/scikits/learn/manifold/examples/projection.py b/scikits/learn/manifold/examples/projection.py
index bfd842a160..f8a15318de 100644
--- a/scikits/learn/manifold/examples/projection.py
+++ b/scikits/learn/manifold/examples/projection.py
@@ -8,7 +8,7 @@ Options:
Usage:
projection.py [projectionkind [datafile [regressionfile [projectedfile]]]]
- - projectionkind is one of the projection algorithm in scikits.learn.machine.manifold_learning.projection (MLProjection, MAPProjection, ...)
+ - projectionkind is one of the projection algorithm in scikits.learn.manifold.projection (MLProjection, MAPProjection, ...)
- datafile is the data file to project (default = swissroll.samples.pickled)
- regressionfile is the model file (default = swissroll.regressed.pickled)
- projectedfile is the output file (default = swissroll.projected.pickled)
@@ -20,7 +20,7 @@ import pickle
import numpy
-from scikits.learn.machine.manifold_learning import projection
+from scikits.learn.manifold import projection
dirname = os.path.dirname(__file__)
diff --git a/scikits/learn/manifold/examples/regression.py b/scikits/learn/manifold/examples/regression.py
index 0c84f7a6a0..2d7866aa5f 100644
--- a/scikits/learn/manifold/examples/regression.py
+++ b/scikits/learn/manifold/examples/regression.py
@@ -8,7 +8,7 @@ Options:
Usage:
regression.py [regressionkind [datafile [compresseddatafile [regressionfile]]]]
- - regressionkind is one of the regression estimation in scikits.learn.machine.manifold_learning.regression (PLMR, MLPLMR)
+ - regressionkind is one of the regression estimation in scikits.learn.manifold.regression (PLMR, MLPLMR)
- datafile is the data file to regress (default = swissroll.pickled)
- compresseddatafile is the compressed file (default = swissroll.isomap.pickled)
- regressionfile is the output file (default = swissroll.regressed.pickled)
@@ -18,7 +18,7 @@ import sys
import pickle
import numpy
-from scikits.learn.machine.manifold_learning import regression
+from scikits.learn.manifold import regression
if len(sys.argv) > 1:
if sys.argv[1] == "-h":
diff --git a/scikits/learn/manifold/regression/PLMR.py b/scikits/learn/manifold/regression/PLMR.py
index 24b4fa6d50..3c3a889078 100644
--- a/scikits/learn/manifold/regression/PLMR.py
+++ b/scikits/learn/manifold/regression/PLMR.py
@@ -10,7 +10,7 @@ import math
import numpy
import numpy.linalg as linalg
from numpy.random import shuffle
-from scikits.learn.machine.manifold_learning import stats
+from scikits.learn.manifold import stats
class PLMR(object):
"""
diff --git a/scikits/learn/manifold/setup.py b/scikits/learn/manifold/setup.py
index 282b11f84c..cafa8a849d 100644
--- a/scikits/learn/manifold/setup.py
+++ b/scikits/learn/manifold/setup.py
@@ -5,7 +5,7 @@ import numpy
def configuration(parent_package='', top_path=None):
from numpy.distutils.misc_util import Configuration
- config = Configuration('manifold_learning',parent_package,top_path)
+ config = Configuration('manifold',parent_package,top_path)
config.add_subpackage('compression')
config.add_data_dir('examples')
config.add_subpackage('projection')
diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py
index 27cfed136d..bdb0b627b2 100644
--- a/scikits/learn/setup.py
+++ b/scikits/learn/setup.py
@@ -1,6 +1,6 @@
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
- config = Configuration('machine',parent_package,top_path)
+ config = Configuration(',parent_package,top_path)
config.add_subpackage('em')
config.add_subpackage('manifold')
config.add_subpackage('svm')
diff --git a/scikits/learn/svm/examples/classification.py b/scikits/learn/svm/examples/classification.py
index 3a56c4df1d..81f1c331c5 100644
--- a/scikits/learn/svm/examples/classification.py
+++ b/scikits/learn/svm/examples/classification.py
@@ -13,7 +13,7 @@ import numpy as N
import pylab as P
import matplotlib as MPL
-from scikits.learn.machine import svm
+from scikits.learn.import svm
import utils
data = utils.iris.load()
diff --git a/scikits/learn/svm/examples/classification2.py b/scikits/learn/svm/examples/classification2.py
index 289fc5451f..812de5123f 100644
--- a/scikits/learn/svm/examples/classification2.py
+++ b/scikits/learn/svm/examples/classification2.py
@@ -14,7 +14,7 @@ import numpy as N
import pylab as P
import matplotlib as MPL
-from scikits.learn.machine import svm
+from scikits.learn.import svm
import utils
from scikits.learn.datasets import german
--
GitLab