MAINT work on Andreas' comments'

Author: mfeurer

openml/tasks/task.py

@@ -33,7 +33,7 @@ def get_dataset(self):
         """Download dataset associated with task"""
         return datasets.get_dataset(self.dataset_id)
 
-    def get_X_and_Y(self):
+    def get_X_and_y(self):
         dataset = self.get_dataset()
         # Replace with retrieve from cache
         if 'Supervised Classification'.lower() in self.task_type.lower():
@@ -42,9 +42,9 @@ def get_X_and_Y(self):
             target_dtype = float
         else:
             raise NotImplementedError(self.task_type)
-        X_and_Y = dataset.get_data(target=self.target_feature,
+        X_and_y = dataset.get_data(target=self.target_feature,
                                    target_dtype=target_dtype)
-        return X_and_Y
+        return X_and_y
 
     def get_train_test_split_indices(self, fold=0, repeat=0):
         # Replace with retrieve from cache

tests/datasets/test_datasets.py

@@ -59,7 +59,7 @@ def test_get_cached_dataset_description_not_cached(self):
 
     def test_get_cached_dataset_arff(self):
         openml.config.set_cache_directory(self.static_cache_dir)
-        description = openml.datasets.functions._get_cached_dataset_arff(2)
+        description = openml.datasets.functions._get_cached_dataset_arff(did=2)
         self.assertIsInstance(description, str)
 
     def test_get_cached_dataset_arff_not_cached(self):

tests/tasks/test_task.py

@@ -32,7 +32,7 @@ def test_get_dataset(self, patch):
     def test_get_X_and_Y(self):
         # Classification task
         task = openml.tasks.get_task(1)
-        X, Y = task.get_X_and_Y()
+        X, Y = task.get_X_and_y()
         self.assertEqual((898, 38), X.shape)
         self.assertIsInstance(X, np.ndarray)
         self.assertEqual((898, ), Y.shape)
@@ -41,7 +41,7 @@ def test_get_X_and_Y(self):
 
         # Regression task
         task = openml.tasks.get_task(2280)
-        X, Y = task.get_X_and_Y()
+        X, Y = task.get_X_and_y()
         self.assertEqual((8192, 8), X.shape)
         self.assertIsInstance(X, np.ndarray)
         self.assertEqual((8192,), Y.shape)