Move metrics into separate package

qurator/dinglehopper/__init__.py

@@ -1,5 +1,3 @@
 from .ocr_files import *
 from .extracted_text import *
-from .character_error_rate import *
-from .word_error_rate import *
 from .align import *

qurator/dinglehopper/cli.py

@@ -6,8 +6,8 @@ from markupsafe import escape
 from uniseg.graphemecluster import grapheme_clusters
 from ocrd_utils import initLogging
 
-from .character_error_rate import character_error_rate_n
+from .metrics.character_error_rate import character_error_rate_n
-from .word_error_rate import word_error_rate_n, words_normalized
+from .metrics.word_error_rate import word_error_rate_n, words_normalized
 from .align import seq_align
 from .extracted_text import ExtractedText
 from .ocr_files import extract

qurator/dinglehopper/metrics/__init__.py

@@ -0,0 +1,2 @@
+from .character_error_rate import *
+from .word_error_rate import *

qurator/dinglehopper/metrics/character_error_rate.py

@@ -6,8 +6,8 @@ from typing import Tuple
 from multimethod import multimethod
 from uniseg.graphemecluster import grapheme_clusters
 
-from .edit_distance import distance
+from ..edit_distance import distance
-from .extracted_text import ExtractedText
+from ..extracted_text import ExtractedText
 
 
 @multimethod

qurator/dinglehopper/metrics/word_error_rate.py

@@ -6,8 +6,8 @@ from multimethod import multimethod
 
 import uniseg.wordbreak
 
-from .edit_distance import levenshtein
+from ..edit_distance import levenshtein
-from . import ExtractedText
+from .. import ExtractedText
 
 
 @multimethod

qurator/dinglehopper/tests/metrics/test_character_error_rate.py

@@ -3,7 +3,7 @@ from __future__ import division, print_function
 import math
 import unicodedata
 
-from .. import character_error_rate
+from ...metrics import character_error_rate
 
 
 def test_character_error_rate():

qurator/dinglehopper/tests/metrics/test_integ_character_error_rate_ocr.py

@@ -6,9 +6,10 @@ import pytest
 from lxml import etree as ET
 from uniseg.graphemecluster import grapheme_clusters
 
-from .. import character_error_rate, page_text, alto_text
+from ... import page_text, alto_text
+from ...metrics import character_error_rate
 
-data_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "data")
+data_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../", "data")
 
 
 @pytest.mark.integration

qurator/dinglehopper/tests/metrics/test_integ_word_error_rate_ocr.py

@@ -5,9 +5,10 @@ import os
 import pytest
 from lxml import etree as ET
 
-from .. import word_error_rate, words, page_text, alto_text
+from ... import page_text, alto_text
+from ...metrics import word_error_rate, words\
 
-data_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "data")
+data_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../", "data")
 
 
 @pytest.mark.integration

qurator/dinglehopper/tests/metrics/test_word_error_rate.py

@@ -2,7 +2,7 @@ from __future__ import division, print_function
 
 import math
 
-from .. import word_error_rate, words
+from ...metrics import word_error_rate, words
 
 
 def test_words():