Skip to content
This repository has been archived by the owner on Jul 2, 2021. It is now read-only.

Use LabelDataset naming convention #405

Merged
merged 10 commits into from
Sep 28, 2017
Merged

Use LabelDataset naming convention #405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
074b53b
modifiy directory_parsing_classification_dataset.py
yuyu2172 Aug 21, 2017
0fd0942
change name of directory_parsing_classification_dataset
yuyu2172 Aug 21, 2017
c566a34
change assert_is_classification_dataset name
yuyu2172 Aug 21, 2017
f7eb7f3
update eval_imagenet
yuyu2172 Aug 21, 2017
f9346d1
fix flake8
yuyu2172 Aug 22, 2017
218d857
merge master
yuyu2172 Sep 14, 2017
1e81821
fix utils.rst
yuyu2172 Sep 14, 2017
3aba208
fix rst
yuyu2172 Sep 14, 2017
578d6cd
merge
yuyu2172 Sep 19, 2017
0e1ee1a
fix doc
yuyu2172 Sep 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change name of directory_parsing_classification_dataset
  • Loading branch information
@yuyu2172
yuyu2172 committed Aug 21, 2017
commit 0fd09424416ab6823636534f33ffa54207257814
4 changes: 2 additions & 2 deletions chainercv/datasets/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from chainercv.datasets.cub.cub_keypoint_dataset import CUBKeypointDataset # NOQA
from chainercv.datasets.cub.cub_label_dataset import CUBLabelDataset # NOQA
from chainercv.datasets.cub.cub_utils import cub_label_names # NOQA
from chainercv.datasets.directory_parsing_classification_dataset import directory_parsing_label_names # NOQA
from chainercv.datasets.directory_parsing_classification_dataset import DirectoryParsingClassificationDataset # NOQA
from chainercv.datasets.directory_parsing_label_dataset import directory_parsing_label_names # NOQA
from chainercv.datasets.directory_parsing_label_dataset import DirectoryParsingLabelDataset # NOQA
from chainercv.datasets.online_products.online_products_dataset import OnlineProductsDataset # NOQA
from chainercv.datasets.transform_dataset import TransformDataset # NOQA
from chainercv.datasets.voc.voc_detection_dataset import VOCDetectionDataset # NOQA
Expand Down
0 ...rectory_parsing_classification_dataset.py → ...tasets/directory_parsing_label_dataset.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/source/reference/datasets.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Datasets

.. module:: chainercv.datasets

DirectoryParsingClassificationDataset
DirectoryParsingLabelDataset
-------------------------------------
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry. This line should also be fixed. (the length of -)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Sorry...

.. autoclass:: DirectoryParsingClassificationDataset
.. autoclass:: DirectoryParsingLabelDataset

directory_parsing_label_names
-----------------------------
Expand Down
12 changes: 6 additions & 6 deletions ...rectory_parsing_classification_dataset.py → ...s/test_directory_parsing_label_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from chainer import testing

from chainercv.datasets import directory_parsing_label_names
from chainercv.datasets import DirectoryParsingClassificationDataset
from chainercv.datasets import DirectoryParsingLabelDataset
from chainercv.utils import assert_is_classification_dataset
from chainercv.utils import write_image

Expand Down Expand Up @@ -55,7 +55,7 @@ def _setup_depth_two_dummy_data(tmp_dir, n_class, n_img_per_class,
'suffix': ['bmp', 'jpg', 'png', 'ppm', 'jpeg'],
'depth': [1, 2]}
))
class TestDirectoryParsingClassificationDataset(unittest.TestCase):
class TestDirectoryParsingLabelDataset(unittest.TestCase):

n_img_per_class = 5
n_sub_directory = 6
Expand All @@ -73,8 +73,8 @@ def setUp(self):
self.n_sub_directory, self.size,
self.color, self.suffix)

def test_directory_parsing_classification_dataset(self):
dataset = DirectoryParsingClassificationDataset(
def test_directory_parsing_label_dataset(self):
dataset = DirectoryParsingLabelDataset(
self.tmp_dir, color=self.color)

if self.depth == 1:
Expand Down Expand Up @@ -107,7 +107,7 @@ def test_directory_parsing_classification_dataset(self):
for k in range(self.n_img_per_class)])


class TestNumericalSortDirectoryParsingClassificationDataset(
class TestNumericalSortDirectoryParsingLabelDataset(
unittest.TestCase):

n_class = 11
Expand All @@ -123,7 +123,7 @@ def setUp(self):
(48, 32), color=True)

def test_numerical_sort(self):
dataset = DirectoryParsingClassificationDataset(
dataset = DirectoryParsingLabelDataset(
self.tmp_dir, numerical_sort=True)

assert_is_classification_dataset(
Expand Down