Refactoring #189

nicolay-r · Sep 22, 2021 · c231226 · c231226
1 parent 65c2e24
commit c231226
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 13 deletions.
diff --git a/...common/experiment/cv/doc_stat/__init__.py → ...ntrib/experiment_rusentrel/cv/__init__.py b/...common/experiment/cv/doc_stat/__init__.py → ...ntrib/experiment_rusentrel/cv/__init__.py
diff --git a/arekit/contrib/experiment_rusentrel/cv/doc_stat/__init__.py b/arekit/contrib/experiment_rusentrel/cv/doc_stat/__init__.py
diff --git a/arekit/common/experiment/cv/doc_stat/base.py → .../experiment_rusentrel/cv/doc_stat/base.py b/arekit/common/experiment/cv/doc_stat/base.py → .../experiment_rusentrel/cv/doc_stat/base.py
@@ -1,6 +1,3 @@
-# TODO. depends on io, issue #189
-# TODO. Rename as BaseDocumentStatProvider!
-# TODO. Move into the particular experiment issue #189
 class BaseDocumentStatGenerator(object):
     """
     Provides statistic on certain document.

diff --git a/...common/experiment/cv/doc_stat/sentence.py → ...eriment_rusentrel/cv/doc_stat/sentence.py b/...common/experiment/cv/doc_stat/sentence.py → ...eriment_rusentrel/cv/doc_stat/sentence.py
@@ -1,10 +1,7 @@
-from arekit.common.experiment.cv.doc_stat.base import BaseDocumentStatGenerator
 from arekit.common.news.base import News
+from arekit.contrib.experiment_rusentrel.cv.doc_stat.base import BaseDocumentStatGenerator
 
 
-# TODO. depends on io, issue #189
-# TODO. We should not adopt inheritance there!
-# TODO. Move into the particular experiment issue #189
 class SentenceBasedDocumentStatGenerator(BaseDocumentStatGenerator):
 
     def __init__(self, doc_reader_func):

diff --git a/...on/experiment/cv/splitters/statistical.py → ...ib/experiment_rusentrel/cv/statistical.py b/...on/experiment/cv/splitters/statistical.py → ...ib/experiment_rusentrel/cv/statistical.py
@@ -1,10 +1,9 @@
 from os import path
 import numpy as np
-from arekit.common.experiment.cv.doc_stat.base import BaseDocumentStatGenerator
 from arekit.common.experiment.cv.splitters.base import CrossValidationSplitter
+from arekit.contrib.experiment_rusentrel.cv.doc_stat.base import BaseDocumentStatGenerator
 
 
-# TODO. Move into the particular experiment issue #189
 class StatBasedCrossValidataionSplitter(CrossValidationSplitter):
     """ Sentence-based splitter.
     """
@@ -74,5 +73,3 @@ def items_to_cv_pairs(self, doc_ids, cv_count):
             large = [doc_id for doc_id, _ in docs_info if doc_id not in small]
 
             yield large, small
-
-
diff --git a/arekit/contrib/experiment_rusentrel/exp_sl/folding.py b/arekit/contrib/experiment_rusentrel/exp_sl/folding.py
@@ -2,12 +2,12 @@
 from os.path import join
 
 from arekit.common.experiment.cv.base import TwoClassCVFolding
-from arekit.common.experiment.cv.doc_stat.sentence import SentenceBasedDocumentStatGenerator
-from arekit.common.experiment.cv.splitters.statistical import StatBasedCrossValidataionSplitter
 from arekit.common.experiment.data_type import DataType
 from arekit.common.experiment.folding.fixed import FixedFolding
 from arekit.common.experiment.folding.types import FoldingType
 from arekit.common.experiment.io_utils import BaseIOUtils
+from arekit.contrib.experiment_rusentrel.cv.doc_stat.sentence import SentenceBasedDocumentStatGenerator
+from arekit.contrib.experiment_rusentrel.cv.statistical import StatBasedCrossValidataionSplitter
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions, RuSentRelIOUtils