Fix, related to #124

nicolay-r · May 27, 2021 · 9dfc52a · 9dfc52a
1 parent 0f23b3d
commit 9dfc52a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/contrib/experiment_rusentrel/exp_sl/opinions.py b/contrib/experiment_rusentrel/exp_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.experiment_rusentrel.labels.formatters.neut_label import RuSentRelNeutralLabelsFormatter
+from arekit.contrib.experiment_rusentrel.labels.formatters.neut_label import ExperimentNeutralLabelsFormatter
 from arekit.contrib.experiment_rusentrel.labels.formatters.rusentrel import RuSentRelExperimentLabelsFormatter
 from arekit.contrib.source.rusentrel.io_utils import RuSentRelVersions
 from arekit.contrib.source.rusentrel.opinions.collection import RuSentRelOpinionCollection
@@ -28,7 +28,7 @@ def __init__(self, experiment_data, experiment_io, get_synonyms_func, version):
         self.__experiment_io = experiment_io
         self.__opinion_formatter = experiment_data.OpinionFormatter
         self.__result_labels_fmt = RuSentRelExperimentLabelsFormatter()
-        self.__neutral_labels_fmt = RuSentRelNeutralLabelsFormatter()
+        self.__neutral_labels_fmt = ExperimentNeutralLabelsFormatter()
 
     # region CVBasedOperations
 
@@ -59,8 +59,10 @@ def iter_opinions_for_extraction(self, doc_id, data_type):
 
     def read_etalon_opinion_collection(self, doc_id):
         assert(isinstance(doc_id, int))
-        opins_iter = RuSentRelOpinionCollection.iter_opinions_from_doc(doc_id=doc_id,
-                                                                       version=self.__version)
+        opins_iter = RuSentRelOpinionCollection.iter_opinions_from_doc(
+            doc_id=doc_id,
+            labels_fmt=self.__result_labels_fmt,
+            version=self.__version)
         return self.__create_collection(opins_iter)
 
     def create_opinion_collection(self):

diff --git a/contrib/experiment_rusentrel/labels/formatters/neut_label.py b/contrib/experiment_rusentrel/labels/formatters/neut_label.py
@@ -2,8 +2,8 @@
 from arekit.contrib.experiment_rusentrel.labels.types import ExperimentNeutralLabel
 
 
-class RuSentRelNeutralLabelsFormatter(StringLabelsFormatter):
+class ExperimentNeutralLabelsFormatter(StringLabelsFormatter):
 
     def __init__(self):
         stol = {u'neu': ExperimentNeutralLabel()}
-        super(RuSentRelNeutralLabelsFormatter, self).__init__(stol=stol)
+        super(ExperimentNeutralLabelsFormatter, self).__init__(stol=stol)