Merge branch 'master' into 'SC-113/implement-repetition-mistakes'

# Conflicts:
#   umbra/mistake_finder.py

umbra/filereader.py

@@ -124,7 +124,7 @@ class TxtWriter(FileWriter):
         source_results, shadow_results, info = results
         final = np.empty(0)
         for i in range(len(source_results)):
-            source_word = source_results.words[i]
+            source_word = source_results[i]
             res = (str(source_word), str(source_word.shadowed)+"\n")
             final = np.append(final, res)
         final = np.append(final, "Total: "+str(info[0]))

umbra/mistake_finder.py

@@ -72,14 +72,15 @@ class MistakeFinder:
 
 
     # TODO: WordNet integration. Function below should be usable already!
-    # def _check_semantic_mistake(self, shd_word):
-    #     shd_string = shd_word.word
-    #     src_string = shd_word.source.word
-    #     if model.seman_check.semantically_related(src_string, shd_string):
-    #         shd_word.mistake = Mistake.SEMANTIC
-    #         src_word.mistake = Mistake.SEMANTIC
-    #         return True
-    #     return False
+    def _check_semantic_mistake(self, shd_word):
+        shd_string = shd_word.word
+        src_string = shd_word.source.word
+        if model.seman_check.semantically_related(src_string, shd_string):
+            shd_word.mistake = Mistake.SEMANTIC
+            src_word.mistake = Mistake.SEMANTIC
+            return True
+        return False
+
+    def _check_phonetic_mistake(self, shd_word):
+        pass
 
-    # def _check_phonetic_mistake(self, shd_word):
-    #