Implemented #97.

nicolay-r · Apr 25, 2021 · 3fc8650 · 3fc8650
1 parent bb7e540
commit 3fc8650
Show file tree

Hide file tree

Showing 44 changed files with 43 additions and 40 deletions.
diff --git a/contrib/experiments/README.md → contrib/experiment_rusentrel/README.md b/contrib/experiments/README.md → contrib/experiment_rusentrel/README.md
diff --git a/contrib/experiments/__init__.py → contrib/experiment_rusentrel/__init__.py b/contrib/experiments/__init__.py → contrib/experiment_rusentrel/__init__.py
diff --git a/contrib/experiments/common.py → contrib/experiment_rusentrel/common.py b/contrib/experiments/common.py → contrib/experiment_rusentrel/common.py
diff --git a/contrib/experiments/ruattitudes/__init__.py → contrib/experiment_rusentrel/ds/__init__.py b/contrib/experiments/ruattitudes/__init__.py → contrib/experiment_rusentrel/ds/__init__.py
diff --git a/contrib/experiments/ruattitudes/documents.py → contrib/experiment_rusentrel/ds/documents.py b/contrib/experiments/ruattitudes/documents.py → contrib/experiment_rusentrel/ds/documents.py
diff --git a/...rib/experiments/ruattitudes/experiment.py → ...rib/experiment_rusentrel/ds/experiment.py b/...rib/experiments/ruattitudes/experiment.py → ...rib/experiment_rusentrel/ds/experiment.py
@@ -1,11 +1,11 @@
 import logging
 
 from arekit.common.experiment.formats.base import BaseExperiment
-from arekit.contrib.experiments.common import entity_to_group_func
-from arekit.contrib.experiments.ruattitudes.documents import RuAttitudesDocumentOperations
-from arekit.contrib.experiments.ruattitudes.folding import create_ruattitudes_experiment_data_folding
-from arekit.contrib.experiments.ruattitudes.opinions import RuAttitudesOpinionOperations
-from arekit.contrib.experiments.ruattitudes.utils import read_ruattitudes_in_memory
+from arekit.contrib.experiment_rusentrel.common import entity_to_group_func
+from arekit.contrib.experiment_rusentrel.ds.documents import RuAttitudesDocumentOperations
+from arekit.contrib.experiment_rusentrel.ds.folding import create_ruattitudes_experiment_data_folding
+from arekit.contrib.experiment_rusentrel.ds.opinions import RuAttitudesOpinionOperations
+from arekit.contrib.experiment_rusentrel.ds.utils import read_ruattitudes_in_memory
 from arekit.contrib.source.ruattitudes.io_utils import RuAttitudesVersions
 
 logger = logging.getLogger(__name__)

diff --git a/contrib/experiments/ruattitudes/folding.py → contrib/experiment_rusentrel/ds/folding.py b/contrib/experiments/ruattitudes/folding.py → contrib/experiment_rusentrel/ds/folding.py
diff --git a/contrib/experiments/ruattitudes/opinions.py → contrib/experiment_rusentrel/ds/opinions.py b/contrib/experiments/ruattitudes/opinions.py → contrib/experiment_rusentrel/ds/opinions.py
diff --git a/contrib/experiments/ruattitudes/utils.py → contrib/experiment_rusentrel/ds/utils.py b/contrib/experiments/ruattitudes/utils.py → contrib/experiment_rusentrel/ds/utils.py
diff --git a/contrib/experiments/factory.py → contrib/experiment_rusentrel/factory.py b/contrib/experiments/factory.py → contrib/experiment_rusentrel/factory.py
@@ -1,9 +1,9 @@
 from arekit.common.experiment.data.base import DataIO
 from arekit.common.experiment.folding.types import FoldingType
-from arekit.contrib.experiments.ruattitudes.experiment import RuAttitudesExperiment
-from arekit.contrib.experiments.rusentrel.experiment import RuSentRelExperiment
-from arekit.contrib.experiments.rusentrel_ds.experiment import RuSentRelWithRuAttitudesExperiment
-from arekit.contrib.experiments.types import ExperimentTypes
+from arekit.contrib.experiment_rusentrel.ds.experiment import RuAttitudesExperiment
+from arekit.contrib.experiment_rusentrel.joined.experiment import RuSentRelWithRuAttitudesExperiment
+from arekit.contrib.experiment_rusentrel.sl.experiment import RuSentRelExperiment
+from arekit.contrib.experiment_rusentrel.types import ExperimentTypes
 
 
 def create_experiment(exp_type,

diff --git a/contrib/experiments/rusentrel/__init__.py → ...b/experiment_rusentrel/joined/__init__.py b/contrib/experiments/rusentrel/__init__.py → ...b/experiment_rusentrel/joined/__init__.py
diff --git a/...rib/experiments/rusentrel_ds/documents.py → .../experiment_rusentrel/joined/documents.py b/...rib/experiments/rusentrel_ds/documents.py → .../experiment_rusentrel/joined/documents.py
@@ -1,6 +1,6 @@
 from arekit.common.experiment.formats.documents import DocumentOperations
-from arekit.contrib.experiments.ruattitudes.documents import RuAttitudesDocumentOperations
-from arekit.contrib.experiments.rusentrel.documents import RuSentrelDocumentOperations
+from arekit.contrib.experiment_rusentrel.ds.documents import RuAttitudesDocumentOperations
+from arekit.contrib.experiment_rusentrel.sl.documents import RuSentrelDocumentOperations
 
 
 class RuSentrelWithRuAttitudesDocumentOperations(DocumentOperations):

diff --git a/...ib/experiments/rusentrel_ds/experiment.py → ...experiment_rusentrel/joined/experiment.py b/...ib/experiments/rusentrel_ds/experiment.py → ...experiment_rusentrel/joined/experiment.py
@@ -2,18 +2,18 @@
 
 from arekit.common.experiment.folding.types import FoldingType
 from arekit.common.experiment.formats.base import BaseExperiment
-from arekit.contrib.experiments.common import entity_to_group_func
 from arekit.common.experiment.io_utils import BaseIOUtils
-from arekit.contrib.experiments.ruattitudes.documents import RuAttitudesDocumentOperations
-from arekit.contrib.experiments.ruattitudes.folding import create_ruattitudes_experiment_data_folding
-from arekit.contrib.experiments.ruattitudes.opinions import RuAttitudesOpinionOperations
-from arekit.contrib.experiments.ruattitudes.utils import read_ruattitudes_in_memory
-from arekit.contrib.experiments.rusentrel.documents import RuSentrelDocumentOperations
-from arekit.contrib.experiments.rusentrel.folding import create_rusentrel_experiment_data_folding
-from arekit.contrib.experiments.rusentrel.opinions import RuSentrelOpinionOperations
-from arekit.contrib.experiments.rusentrel_ds.documents import RuSentrelWithRuAttitudesDocumentOperations
-from arekit.contrib.experiments.rusentrel_ds.opinions import RuSentrelWithRuAttitudesOpinionOperations
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+from arekit.contrib.experiment_rusentrel.common import entity_to_group_func
+from arekit.contrib.experiment_rusentrel.ds.documents import RuAttitudesDocumentOperations
+from arekit.contrib.experiment_rusentrel.ds.folding import create_ruattitudes_experiment_data_folding
+from arekit.contrib.experiment_rusentrel.ds.opinions import RuAttitudesOpinionOperations
+from arekit.contrib.experiment_rusentrel.ds.utils import read_ruattitudes_in_memory
+from arekit.contrib.experiment_rusentrel.joined.documents import RuSentrelWithRuAttitudesDocumentOperations
+from arekit.contrib.experiment_rusentrel.joined.opinions import RuSentrelWithRuAttitudesOpinionOperations
+from arekit.contrib.experiment_rusentrel.sl.documents import RuSentrelDocumentOperations
+from arekit.contrib.experiment_rusentrel.sl.folding import create_rusentrel_experiment_data_folding
+from arekit.contrib.experiment_rusentrel.sl.opinions import RuSentrelOpinionOperations
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.contrib.source.ruattitudes.io_utils import RuAttitudesVersions
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions
 

diff --git a/contrib/experiments/rusentrel_ds/opinions.py → ...b/experiment_rusentrel/joined/opinions.py b/contrib/experiments/rusentrel_ds/opinions.py → ...b/experiment_rusentrel/joined/opinions.py
@@ -1,6 +1,6 @@
 from arekit.common.experiment.data_type import DataType
 from arekit.common.experiment.formats.opinions import OpinionOperations
-from arekit.contrib.experiments.rusentrel.opinions import RuSentrelOpinionOperations
+from arekit.contrib.experiment_rusentrel.sl.opinions import RuSentrelOpinionOperations
 
 
 class RuSentrelWithRuAttitudesOpinionOperations(OpinionOperations):

diff --git a/contrib/experiments/rusentrel_ds/__init__.py → contrib/experiment_rusentrel/sl/__init__.py b/contrib/experiments/rusentrel_ds/__init__.py → contrib/experiment_rusentrel/sl/__init__.py
diff --git a/contrib/experiments/rusentrel/documents.py → contrib/experiment_rusentrel/sl/documents.py b/contrib/experiments/rusentrel/documents.py → contrib/experiment_rusentrel/sl/documents.py
diff --git a/contrib/experiments/rusentrel/experiment.py → ...rib/experiment_rusentrel/sl/experiment.py b/contrib/experiments/rusentrel/experiment.py → ...rib/experiment_rusentrel/sl/experiment.py
@@ -2,12 +2,12 @@
 
 from arekit.common.experiment.folding.types import FoldingType
 from arekit.common.experiment.formats.base import BaseExperiment
-from arekit.contrib.experiments.common import entity_to_group_func
 from arekit.common.experiment.io_utils import BaseIOUtils
-from arekit.contrib.experiments.rusentrel.documents import RuSentrelDocumentOperations
-from arekit.contrib.experiments.rusentrel.folding import create_rusentrel_experiment_data_folding
-from arekit.contrib.experiments.rusentrel.opinions import RuSentrelOpinionOperations
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+from arekit.contrib.experiment_rusentrel.common import entity_to_group_func
+from arekit.contrib.experiment_rusentrel.sl.documents import RuSentrelDocumentOperations
+from arekit.contrib.experiment_rusentrel.sl.folding import create_rusentrel_experiment_data_folding
+from arekit.contrib.experiment_rusentrel.sl.opinions import RuSentrelOpinionOperations
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions
 
 logger = logging.getLogger(__name__)

diff --git a/contrib/experiments/rusentrel/folding.py → contrib/experiment_rusentrel/sl/folding.py b/contrib/experiments/rusentrel/folding.py → contrib/experiment_rusentrel/sl/folding.py
diff --git a/...experiments/rusentrel/labels_formatter.py → ...periment_rusentrel/sl/labels_formatter.py b/...experiments/rusentrel/labels_formatter.py → ...periment_rusentrel/sl/labels_formatter.py
diff --git a/contrib/experiments/rusentrel/opinions.py → contrib/experiment_rusentrel/sl/opinions.py b/contrib/experiments/rusentrel/opinions.py → contrib/experiment_rusentrel/sl/opinions.py
@@ -6,7 +6,7 @@
 from arekit.common.experiment.formats.opinions import OpinionOperations
 from arekit.common.experiment.io_utils import BaseIOUtils
 from arekit.common.opinions.collection import OpinionCollection
-from arekit.contrib.experiments.rusentrel.labels_formatter import RuSentRelNeutralLabelsFormatter
+from arekit.contrib.experiment_rusentrel.sl.labels_formatter import RuSentRelNeutralLabelsFormatter
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions
 from arekit.contrib.source.rusentrel.labels_fmt import RuSentRelLabelsFormatter
 from arekit.contrib.source.rusentrel.opinions.collection import RuSentRelOpinionCollection

diff --git a/contrib/experiments/synonyms/__init__.py → ...experiment_rusentrel/synonyms/__init__.py b/contrib/experiments/synonyms/__init__.py → ...experiment_rusentrel/synonyms/__init__.py
diff --git a/contrib/experiments/synonyms/collection.py → ...periment_rusentrel/synonyms/collection.py b/contrib/experiments/synonyms/collection.py → ...periment_rusentrel/synonyms/collection.py
diff --git a/contrib/experiments/synonyms/provider.py → ...experiment_rusentrel/synonyms/provider.py b/contrib/experiments/synonyms/provider.py → ...experiment_rusentrel/synonyms/provider.py
@@ -1,4 +1,4 @@
-from arekit.contrib.experiments.synonyms.collection import StemmerBasedSynonymCollection
+from arekit.contrib.experiment_rusentrel.synonyms.collection import StemmerBasedSynonymCollection
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions
 from arekit.contrib.source.rusentrel.synonyms import RuSentRelSynonymsCollectionHelper
 from arekit.processing.lemmatization.base import Stemmer

diff --git a/contrib/experiments/tests/__init__.py → ...ib/experiment_rusentrel/tests/__init__.py b/contrib/experiments/tests/__init__.py → ...ib/experiment_rusentrel/tests/__init__.py
diff --git a/...ts/tests/data/att-cnn-fixed-20e-f1-41.zip → ...el/tests/data/att-cnn-fixed-20e-f1-41.zip b/...ts/tests/data/att-cnn-fixed-20e-f1-41.zip → ...el/tests/data/att-cnn-fixed-20e-f1-41.zip
diff --git a/...s/tests/data/att-pcnn-fixed-26e-f1-41.zip → ...l/tests/data/att-pcnn-fixed-26e-f1-41.zip b/...s/tests/data/att-pcnn-fixed-26e-f1-41.zip → ...l/tests/data/att-pcnn-fixed-26e-f1-41.zip
diff --git a/...iments/tests/data/cv3_att-pcnn_e40_i0.zip → ...entrel/tests/data/cv3_att-pcnn_e40_i0.zip b/...iments/tests/data/cv3_att-pcnn_e40_i0.zip → ...entrel/tests/data/cv3_att-pcnn_e40_i0.zip
diff --git a/...iments/tests/data/cv3_att-pcnn_e40_i1.zip → ...entrel/tests/data/cv3_att-pcnn_e40_i1.zip b/...iments/tests/data/cv3_att-pcnn_e40_i1.zip → ...entrel/tests/data/cv3_att-pcnn_e40_i1.zip
diff --git a/...iments/tests/data/cv3_att-pcnn_e40_i2.zip → ...entrel/tests/data/cv3_att-pcnn_e40_i2.zip b/...iments/tests/data/cv3_att-pcnn_e40_i2.zip → ...entrel/tests/data/cv3_att-pcnn_e40_i2.zip
diff --git a/...ments/tests/data/ds_att-cnn-fixed_e40.zip → ...ntrel/tests/data/ds_att-cnn-fixed_e40.zip b/...ments/tests/data/ds_att-cnn-fixed_e40.zip → ...ntrel/tests/data/ds_att-cnn-fixed_e40.zip
diff --git a/...nts/tests/data/pcnn-lrec-ds-e27-fixed.zip → ...rel/tests/data/pcnn-lrec-ds-e27-fixed.zip b/...nts/tests/data/pcnn-lrec-ds-e27-fixed.zip → ...rel/tests/data/pcnn-lrec-ds-e27-fixed.zip
diff --git a/...ents/tests/data/pcnn_results_fixed_5e.zip → ...trel/tests/data/pcnn_results_fixed_5e.zip b/...ents/tests/data/pcnn_results_fixed_5e.zip → ...trel/tests/data/pcnn_results_fixed_5e.zip
diff --git a/...s/tests/data/rsr-ra-20-large-neut-cnn.zip → ...l/tests/data/rsr-ra-20-large-neut-cnn.zip b/...s/tests/data/rsr-ra-20-large-neut-cnn.zip → ...l/tests/data/rsr-ra-20-large-neut-cnn.zip
diff --git a/...eriments/tests/data/self-rusentrel-11.zip → ...usentrel/tests/data/self-rusentrel-11.zip b/...eriments/tests/data/self-rusentrel-11.zip → ...usentrel/tests/data/self-rusentrel-11.zip
diff --git a/...experiments/tests/test_input_balancing.py → ...t_rusentrel/tests/test_input_balancing.py b/...experiments/tests/test_input_balancing.py → ...t_rusentrel/tests/test_input_balancing.py
@@ -1,12 +1,13 @@
 import sys
 import unittest
 
+
 sys.path.append('../')
 
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.contrib.bert.core.input.providers.label.binary import BinaryLabelProvider
+from arekit.contrib.experiment_rusentrel.common import entity_to_group_func
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.common.experiment.data_type import DataType
-from arekit.contrib.experiments.common import entity_to_group_func
 from arekit.common.experiment.input.formatters.helper.balancing import SampleRowBalancerHelper
 from arekit.common.experiment.input.formatters.sample import BaseSampleFormatter
 from arekit.common.experiment.input.providers.text.single import BaseSingleTextProvider

diff --git a/...ments/tests/test_news_entities_parsing.py → ...ntrel/tests/test_news_entities_parsing.py b/...ments/tests/test_news_entities_parsing.py → ...ntrel/tests/test_news_entities_parsing.py
@@ -2,7 +2,7 @@
 
 from arekit.common.entities.base import Entity
 from arekit.common.news.parsed.base import ParsedNews
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.contrib.source.ruattitudes.collection import RuAttitudesCollection
 from arekit.contrib.source.ruattitudes.io_utils import RuAttitudesVersions
 from arekit.contrib.source.ruattitudes.news.base import RuAttitudesNews

diff --git a/contrib/experiments/tests/test_rusentrel.py → ...eriment_rusentrel/tests/test_rusentrel.py b/contrib/experiments/tests/test_rusentrel.py → ...eriment_rusentrel/tests/test_rusentrel.py
@@ -15,7 +15,8 @@
 
 from arekit.processing.lemmatization.mystem import MystemWrapper
 
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
+
 from arekit.contrib.source.rusentrel.news.base import RuSentRelNews
 from arekit.contrib.source.rusentrel.sentence import RuSentRelSentence
 from arekit.contrib.source.rusentrel.entities.entity import RuSentRelEntity

diff --git a/.../experiments/tests/test_rusentrel_eval.py → ...nt_rusentrel/tests/test_rusentrel_eval.py b/.../experiments/tests/test_rusentrel_eval.py → ...nt_rusentrel/tests/test_rusentrel_eval.py
@@ -13,7 +13,7 @@
 from arekit.common.opinions.collection import OpinionCollection
 from arekit.common.synonyms import SynonymsCollection
 from arekit.common.utils import progress_bar_iter
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions
 from arekit.contrib.source.rusentrel.labels_fmt import RuSentRelLabelsFormatter
 from arekit.contrib.source.rusentrel.opinions.collection import RuSentRelOpinionCollection

diff --git a/...nts/tests/test_rusentrel_opinions_iter.py → ...rel/tests/test_rusentrel_opinions_iter.py b/...nts/tests/test_rusentrel_opinions_iter.py → ...rel/tests/test_rusentrel_opinions_iter.py
@@ -13,7 +13,8 @@
 from arekit.contrib.source.rusentiframes.collection import RuSentiFramesCollection
 from arekit.contrib.source.rusentiframes.types import RuSentiFramesVersions
 from arekit.contrib.source.tests.text.news import init_rusentrel_doc
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 
 from arekit.common.entities.str_fmt import StringEntitiesFormatter
 from arekit.common.entities.formatters.str_rus_cased_fmt import RussianEntitiesCasedFormatter

diff --git a/contrib/experiments/tests/test_synonyms.py → ...periment_rusentrel/tests/test_synonyms.py b/contrib/experiments/tests/test_synonyms.py → ...periment_rusentrel/tests/test_synonyms.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.contrib.source.ruattitudes.io_utils import RuAttitudesVersions
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions
 from arekit.processing.lemmatization.mystem import MystemWrapper

diff --git a/contrib/experiments/types.py → contrib/experiment_rusentrel/types.py b/contrib/experiments/types.py → contrib/experiment_rusentrel/types.py
diff --git a/contrib/networks/core/model.py b/contrib/networks/core/model.py
@@ -6,7 +6,6 @@
 
 from tensorflow.python.training.saver import Saver
 
-from arekit.common.evaluation.evaluators.base import BaseEvaluator
 from arekit.common.experiment.scales.base import BaseLabelScaler
 from arekit.common.experiment.labeling import LabeledCollection
 from arekit.common.model.base import BaseModel

diff --git a/contrib/networks/tests/test_tf_input_features.py b/contrib/networks/tests/test_tf_input_features.py
@@ -19,14 +19,15 @@
 
 from arekit.contrib.networks.tests.text.news import init_rusentrel_doc
 from arekit.contrib.networks.features.term_indices import IndicesFeature
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
 
 from arekit.tests.text.linked_opinions import iter_same_sentence_linked_text_opinions
 from arekit.tests.text.utils import terms_to_str
 
 from arekit.contrib.source.rusentiframes.collection import RuSentiFramesCollection
 from arekit.contrib.source.rusentiframes.types import RuSentiFramesVersions
 
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
+
 
 class TestTfInputFeatures(unittest.TestCase):
 

diff --git a/processing/tests/test_text_parser.py b/processing/tests/test_text_parser.py
@@ -1,7 +1,7 @@
 import logging
 import unittest
 
-from arekit.contrib.experiments.synonyms.provider import RuSentRelSynonymsCollectionProvider
+from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.processing.lemmatization.mystem import MystemWrapper
 from arekit.processing.tests.text.debug_text import debug_show_news_terms
 from arekit.processing.text.parser import TextParser