Unverified Commit 99651bfb authored by Bharath Ramsundar's avatar Bharath Ramsundar Committed by GitHub
Browse files

Merge pull request #2177 from nd-02110114/deplicate-warn

Rename IndiceSplitter to SpecifiedSplitter
parents eda2bcd4 e714e14a
Loading
Loading
Loading
Loading
+15 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ from deepchem.splits.splitters import RandomStratifiedSplitter
from deepchem.splits.splitters import RandomGroupSplitter
from deepchem.splits.splitters import SingletaskStratifiedSplitter
from deepchem.splits.splitters import IndexSplitter
from deepchem.splits.splitters import IndiceSplitter
from deepchem.splits.splitters import SpecifiedSplitter

# molecule splitter
from deepchem.splits.splitters import ScaffoldSplitter
@@ -22,3 +22,17 @@ from deepchem.splits.splitters import ButinaSplitter
# other splitter
from deepchem.splits.task_splitter import merge_fold_datasets
from deepchem.splits.task_splitter import TaskSplitter

#################################################################
# Removed API
#################################################################

import logging
logger = logging.getLogger(__name__)


class IndiceSplitter:

  def __init__(self, valid_indices=None, test_indices=None):
    raise ImportError("IndiceSplitter was renamed to SpecifiedSplitter.\n"
                      "Please use SpecifiedSplitter instead of IndiceSplitter.")
+2 −2
Original line number Diff line number Diff line
@@ -858,14 +858,14 @@ class IndexSplitter(Splitter):
            indices[valid_cutoff:])


class IndiceSplitter(Splitter):
class SpecifiedSplitter(Splitter):
  """Split data in the fashion specified by user.

  For some applications, you will already know how you'd like to split the
  dataset. In this splitter, you simplify specify `valid_indices` and
  `test_indices` and the datapoints at those indices are pulled out of the
  dataset. Note that this is different from `IndexSplitter` which only splits
  based on the existing dataset ordering, while this `IndiceSplitter` can
  based on the existing dataset ordering, while this `SpecifiedSplitter` can
  split on any specified ordering.
  """

+2 −2
Original line number Diff line number Diff line
@@ -566,10 +566,10 @@ class TestSplitter(unittest.TestCase):
      # that have no hits.
      assert len(np.where(w.any(axis=1) == 0)[0]) == 0

  def test_indice_split(self):
  def test_specified_split(self):

    solubility_dataset = load_solubility_data()
    random_splitter = dc.splits.IndiceSplitter(
    random_splitter = dc.splits.SpecifiedSplitter(
        valid_indices=[7], test_indices=[8])
    train_data, valid_data, test_data = \
      random_splitter.split(
+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ IndexSplitter
.. autoclass:: deepchem.splits.IndexSplitter
  :members:

IndiceSplitter
SpecifiedSplitter
--------------

.. autoclass:: deepchem.splits.IndiceSplitter
.. autoclass:: deepchem.splits.SpecifiedSplitter
  :members: