Update count to skip more habitat terms

rafelafrance · Mar 22, 2024 · 66fc2ce · 66fc2ce
1 parent 9457995
commit 66fc2ce
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/flora/pylib/rules/count.py b/flora/pylib/rules/count.py
@@ -80,7 +80,7 @@ def key(self) -> str:
 
     @classmethod
     def pipe(cls, nlp: Language):
-        add.term_pipe(nlp, name="count_terms", path=cls.all_csvs, delete_patterns="in")
+        add.term_pipe(nlp, name="count_terms", path=cls.all_csvs)
         add.trait_pipe(
             nlp,
             name="count_match",
@@ -115,7 +115,7 @@ def count_patterns(cls):
             "count_word": {"ENT_TYPE": {"IN": ["count_word", "number_word"]}},
             "dim": {"ENT_TYPE": "dim"},
             "every": {"LOWER": {"IN": cls.every}},
-            "habitat": {"ENT_TYPE": "habitat"},
+            "habitat": {"ENT_TYPE": {"IN": ["habitat", "habitat_term"]}},
             "is_alpha": {"IS_ALPHA": True},
             "missing": {"ENT_TYPE": "missing"},
             "not_count_symbol": {"LOWER": {"IN": cls.not_count_symbol}},