From c2b0de59aa778bff268d8eebfaaa9158487ef9a7 Mon Sep 17 00:00:00 2001
From: jaroslaw-weber <jaroslaw.weber@gmail.com>
Date: Mon, 8 May 2017 17:02:38 +0900
Subject: [PATCH] [MRG+1] added DESCR attribute in diabetes data (#8840)
* added DESCR attribute in diabetes data
* added DESCR attribute in diabetes data (fix flake8)
* added DESCR attribute in diabetes data (added test)
---
sklearn/datasets/base.py | 9 +++++++--
sklearn/datasets/tests/test_base.py | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sklearn/datasets/base.py b/sklearn/datasets/base.py
index 2ad2bdb16c..58762a2fce 100644
--- a/sklearn/datasets/base.py
+++ b/sklearn/datasets/base.py
@@ -568,14 +568,19 @@ def load_diabetes(return_X_y=False):
.. versionadded:: 0.18
"""
- base_dir = join(dirname(__file__), 'data')
+
+ module_path = dirname(__file__)
+ base_dir = join(module_path, 'data')
data = np.loadtxt(join(base_dir, 'diabetes_data.csv.gz'))
target = np.loadtxt(join(base_dir, 'diabetes_target.csv.gz'))
+ with open(join(module_path, 'descr', 'diabetes.rst')) as rst_file:
+ fdescr = rst_file.read()
+
if return_X_y:
return data, target
- return Bunch(data=data, target=target,
+ return Bunch(data=data, target=target, DESCR=fdescr,
feature_names=['age', 'sex', 'bmi', 'bp',
's1', 's2', 's3', 's4', 's5', 's6'])
diff --git a/sklearn/datasets/tests/test_base.py b/sklearn/datasets/tests/test_base.py
index c0dd510190..5c171561bd 100644
--- a/sklearn/datasets/tests/test_base.py
+++ b/sklearn/datasets/tests/test_base.py
@@ -173,6 +173,7 @@ def test_load_diabetes():
assert_equal(res.data.shape, (442, 10))
assert_true(res.target.size, 442)
assert_equal(len(res.feature_names), 10)
+ assert_true(res.DESCR)
# test return_X_y option
X_y_tuple = load_diabetes(return_X_y=True)
--
GitLab