From dfd46893c0c1603080e1309c9d8293a450eca9ab Mon Sep 17 00:00:00 2001
From: Gael varoquaux <gael.varoquaux@normalesup.org>
Date: Wed, 9 Nov 2011 13:09:55 +0100
Subject: [PATCH] DOC/API: integrate make_sparse_spd_matrix
---
doc/datasets/index.rst | 2 +-
doc/modules/covariance.rst | 2 +-
examples/covariance/plot_sparse_cov.py | 2 +-
sklearn/datasets/__init__.py | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/datasets/index.rst b/doc/datasets/index.rst
index 2c5ca9f93b..13a56d21db 100644
--- a/doc/datasets/index.rst
+++ b/doc/datasets/index.rst
@@ -97,7 +97,7 @@ can be used to build artifical datasets of controled size and complexity.
make_spd_matrix
make_swiss_roll
make_s_curve
-
+ make_sparse_spd_matrix
.. _libsvm_loader:
diff --git a/doc/modules/covariance.rst b/doc/modules/covariance.rst
index 65e687ea75..88214959c0 100644
--- a/doc/modules/covariance.rst
+++ b/doc/modules/covariance.rst
@@ -232,7 +232,7 @@ paper. It is the same algorithm as in the R `glasso` package.
covariance estimators.
* :ref:`example_applications_plot_stock_market.py`: example on real
- stock market data, finding which symbols are most linked.
+ stock market data, finding which symbols are most linked.
.. topic:: References:
diff --git a/examples/covariance/plot_sparse_cov.py b/examples/covariance/plot_sparse_cov.py
index b1707de8b0..8008a47d94 100644
--- a/examples/covariance/plot_sparse_cov.py
+++ b/examples/covariance/plot_sparse_cov.py
@@ -55,7 +55,7 @@ print __doc__
import numpy as np
from scipy import linalg
-from sklearn.datasets.samples_generator import make_sparse_spd_matrix
+from sklearn.datasets import make_sparse_spd_matrix
from sklearn.covariance import GraphLassoCV, ledoit_wolf
import pylab as pl
diff --git a/sklearn/datasets/__init__.py b/sklearn/datasets/__init__.py
index a3c2509659..3c3442d031 100644
--- a/sklearn/datasets/__init__.py
+++ b/sklearn/datasets/__init__.py
@@ -28,6 +28,7 @@ from .samples_generator import make_sparse_uncorrelated
from .samples_generator import make_spd_matrix
from .samples_generator import make_swiss_roll
from .samples_generator import make_s_curve
+from .samples_generator import make_sparse_spd_matrix
from .svmlight_format import load_svmlight_file
from .svmlight_format import load_svmlight_files
from .svmlight_format import dump_svmlight_file
--
GitLab