Merge pull request scikit-learn#3445 from arjoly/flatten-metrics

[MRG+1] MAINT flatten metrics module and avoid nested bicluster module

Author: arjoly

sklearn/cluster/bicluster/tests/test_spectral.py

@@ -18,7 +18,7 @@
 from sklearn.cluster.bicluster.spectral import _bistochastic_normalize
 from sklearn.cluster.bicluster.spectral import _log_normalize
 
-from sklearn.metrics.cluster.bicluster import consensus_score
+from sklearn.metrics import consensus_score
 
 from sklearn.datasets import make_biclusters, make_checkerboard
 

sklearn/metrics/cluster/bicluster/bicluster_metrics.py renamed to sklearn/metrics/cluster/bicluster.py

@@ -5,6 +5,8 @@
 from sklearn.utils.linear_assignment_ import linear_assignment
 from sklearn.utils.validation import check_arrays
 
+__all__ = ["consensus_score"]
+
 
 def _check_rows_and_columns(a, b):
     """Unpacks the row and column arrays and checks their shape."""

sklearn/metrics/cluster/bicluster/__init__.py

@@ -4,8 +4,8 @@
 
 from sklearn.utils.testing import assert_equal
 
-from ..bicluster_metrics import _jaccard
-from ..bicluster_metrics import consensus_score
+from sklearn.metrics.cluster.bicluster import _jaccard
+from sklearn.metrics import consensus_score
 
 
 def test_jaccard():

sklearn/metrics/cluster/bicluster/tests/__init__.py

@@ -51,8 +51,6 @@ def configuration(parent_package='', top_path=None):
     config.add_subpackage('metrics/tests')
     config.add_subpackage('metrics/cluster')
     config.add_subpackage('metrics/cluster/tests')
-    config.add_subpackage('metrics/cluster/bicluster')
-    config.add_subpackage('metrics/cluster/bicluster/tests')
 
     # add cython extension module for hmm
     config.add_extension(