avoid unnecessary loop to check overlapping noun chunks

spacy/lang/el/syntax_iterators.py

@@ -23,12 +23,12 @@ def noun_chunks(obj):
     conj = doc.vocab.strings.add("conj")
     nmod = doc.vocab.strings.add("nmod")
     np_label = doc.vocab.strings.add("NP")
-    seen = set()
+    prev_end = -1
     for i, word in enumerate(obj):
         if word.pos not in (NOUN, PROPN, PRON):
             continue
         # Prevent nested chunks from being produced
-        if word.i in seen:
+        if word.left_edge.i <= prev_end:
             continue
         if word.dep in np_deps:
             flag = False
@@ -36,15 +36,12 @@ def noun_chunks(obj):
                 #  check for patterns such as γραμμή παραγωγής
                 for potential_nmod in word.rights:
                     if potential_nmod.dep == nmod:
-                        w_range = range(word.left_edge.i, potential_nmod.i + 1)
+                        prev_end = potential_nmod.i + 1
-                        if any(j in seen for j in w_range):
-                            continue
-                        seen.update(j for j in w_range)
                         yield word.left_edge.i, potential_nmod.i + 1, np_label
                         flag = True
                         break
             if flag is False:
-                seen.update(j for j in range(word.left_edge.i, word.i + 1))
+                prev_end = word.i + 1
                 yield word.left_edge.i, word.i + 1, np_label
         elif word.dep == conj:
             # covers the case: έχει όμορφα και έξυπνα παιδιά
@@ -53,10 +50,7 @@ def noun_chunks(obj):
                 head = head.head
             # If the head is an NP, and we're coordinated to it, we're an NP
             if head.dep in np_deps:
-                w_range = range(word.left_edge.i, word.i + 1)
+                prev_end = word.i + 1
-                if any(j in seen for j in w_range):
-                    continue
-                seen.update(j for j in w_range)
                 yield word.left_edge.i, word.i + 1, np_label
 
 

spacy/lang/en/syntax_iterators.py

@@ -28,18 +28,15 @@ def noun_chunks(obj):
     np_deps = [doc.vocab.strings.add(label) for label in labels]
     conj = doc.vocab.strings.add("conj")
     np_label = doc.vocab.strings.add("NP")
-    seen = set()
+    prev_end = -1
     for i, word in enumerate(obj):
         if word.pos not in (NOUN, PROPN, PRON):
             continue
         # Prevent nested chunks from being produced
-        if word.i in seen:
+        if word.left_edge.i <= prev_end:
             continue
         if word.dep in np_deps:
-            w_range = range(word.left_edge.i, word.i + 1)
+            prev_end = word.i + 1
-            if any(j in seen for j in w_range):
-                continue
-            seen.update(j for j in w_range)
             yield word.left_edge.i, word.i + 1, np_label
         elif word.dep == conj:
             head = word.head
@@ -47,10 +44,7 @@ def noun_chunks(obj):
                 head = head.head
             # If the head is an NP, and we're coordinated to it, we're an NP
             if head.dep in np_deps:
-                w_range = range(word.left_edge.i, word.i + 1)
+                prev_end = word.i + 1
-                if any(j in seen for j in w_range):
-                    continue
-                seen.update(j for j in w_range)
                 yield word.left_edge.i, word.i + 1, np_label
 
 

spacy/lang/fa/syntax_iterators.py

@@ -28,18 +28,15 @@ def noun_chunks(obj):
     np_deps = [doc.vocab.strings.add(label) for label in labels]
     conj = doc.vocab.strings.add("conj")
     np_label = doc.vocab.strings.add("NP")
-    seen = set()
+    prev_end = -1
     for i, word in enumerate(obj):
         if word.pos not in (NOUN, PROPN, PRON):
             continue
         # Prevent nested chunks from being produced
-        if word.i in seen:
+        if word.left_edge.i <= prev_end:
             continue
         if word.dep in np_deps:
-            w_range = range(word.left_edge.i, word.i + 1)
+            prev_end = word.i + 1
-            if any(j in seen for j in w_range):
-                continue
-            seen.update(j for j in w_range)
             yield word.left_edge.i, word.i + 1, np_label
         elif word.dep == conj:
             head = word.head
@@ -47,10 +44,7 @@ def noun_chunks(obj):
                 head = head.head
             # If the head is an NP, and we're coordinated to it, we're an NP
             if head.dep in np_deps:
-                w_range = range(word.left_edge.i, word.i + 1)
+                prev_end = word.i + 1
-                if any(j in seen for j in w_range):
-                    continue
-                seen.update(j for j in w_range)
                 yield word.left_edge.i, word.i + 1, np_label
 
 

spacy/lang/fr/syntax_iterators.py

@@ -27,18 +27,15 @@ def noun_chunks(obj):
     np_deps = [doc.vocab.strings[label] for label in labels]
     conj = doc.vocab.strings.add("conj")
     np_label = doc.vocab.strings.add("NP")
-    seen = set()
+    prev_end = -1
     for i, word in enumerate(obj):
         if word.pos not in (NOUN, PROPN, PRON):
             continue
         # Prevent nested chunks from being produced
-        if word.i in seen:
+        if word.left_edge.i <= prev_end:
             continue
         if word.dep in np_deps:
-            w_range = range(word.left_edge.i, word.right_edge.i + 1)
+            prev_end = word.right_edge.i + 1
-            if any(j in seen for j in w_range):
-                continue
-            seen.update(j for j in w_range)
             yield word.left_edge.i, word.right_edge.i + 1, np_label
         elif word.dep == conj:
             head = word.head
@@ -46,10 +43,7 @@ def noun_chunks(obj):
                 head = head.head
             # If the head is an NP, and we're coordinated to it, we're an NP
             if head.dep in np_deps:
-                w_range = range(word.left_edge.i, word.right_edge.i + 1)
+                prev_end = word.right_edge.i + 1
-                if any(j in seen for j in w_range):
-                    continue
-                seen.update(j for j in w_range)
                 yield word.left_edge.i, word.right_edge.i + 1, np_label
 
 

spacy/lang/id/syntax_iterators.py

@@ -27,18 +27,15 @@ def noun_chunks(obj):
     np_deps = [doc.vocab.strings[label] for label in labels]
     conj = doc.vocab.strings.add("conj")
     np_label = doc.vocab.strings.add("NP")
-    seen = set()
+    prev_end = -1
     for i, word in enumerate(obj):
         if word.pos not in (NOUN, PROPN, PRON):
             continue
         # Prevent nested chunks from being produced
-        if word.i in seen:
+        if word.left_edge.i <= prev_end:
             continue
         if word.dep in np_deps:
-            w_range = range(word.left_edge.i, word.right_edge.i + 1)
+            prev_end = word.right_edge.i + 1
-            if any(j in seen for j in w_range):
-                continue
-            seen.update(j for j in w_range)
             yield word.left_edge.i, word.right_edge.i + 1, np_label
         elif word.dep == conj:
             head = word.head
@@ -46,10 +43,7 @@ def noun_chunks(obj):
                 head = head.head
             # If the head is an NP, and we're coordinated to it, we're an NP
             if head.dep in np_deps:
-                w_range = range(word.left_edge.i, word.right_edge.i + 1)
+                prev_end = word.right_edge.i + 1
-                if any(j in seen for j in w_range):
-                    continue
-                seen.update(j for j in w_range)
                 yield word.left_edge.i, word.right_edge.i + 1, np_label
 
 

spacy/lang/nb/syntax_iterators.py

@@ -27,18 +27,15 @@ def noun_chunks(obj):
     np_deps = [doc.vocab.strings[label] for label in labels]
     conj = doc.vocab.strings.add("conj")
     np_label = doc.vocab.strings.add("NP")
-    seen = set()
+    prev_end = -1
     for i, word in enumerate(obj):
         if word.pos not in (NOUN, PROPN, PRON):
             continue
         # Prevent nested chunks from being produced
-        if word.i in seen:
+        if word.left_edge.i <= prev_end:
             continue
         if word.dep in np_deps:
-            w_range = range(word.left_edge.i, word.right_edge.i + 1)
+            prev_end = word.right_edge.i + 1
-            if any(j in seen for j in w_range):
-                continue
-            seen.update(j for j in w_range)
             yield word.left_edge.i, word.right_edge.i + 1, np_label
         elif word.dep == conj:
             head = word.head
@@ -46,10 +43,7 @@ def noun_chunks(obj):
                 head = head.head
             # If the head is an NP, and we're coordinated to it, we're an NP
             if head.dep in np_deps:
-                w_range = range(word.left_edge.i, word.right_edge.i + 1)
+                prev_end = word.right_edge.i + 1
-                if any(j in seen for j in w_range):
-                    continue
-                seen.update(j for j in w_range)
                 yield word.left_edge.i, word.right_edge.i + 1, np_label
 
 

spacy/lang/sv/syntax_iterators.py

@@ -28,18 +28,15 @@ def noun_chunks(obj):
     np_deps = [doc.vocab.strings[label] for label in labels]
     conj = doc.vocab.strings.add("conj")
     np_label = doc.vocab.strings.add("NP")
-    seen = set()
+    prev_end = -1
     for i, word in enumerate(obj):
         if word.pos not in (NOUN, PROPN, PRON):
             continue
         # Prevent nested chunks from being produced
-        if word.i in seen:
+        if word.left_edge.i <= prev_end:
             continue
         if word.dep in np_deps:
-            w_range = range(word.left_edge.i, word.right_edge.i + 1)
+            prev_end = word.right_edge.i + 1
-            if any(j in seen for j in w_range):
-                continue
-            seen.update(j for j in w_range)
             yield word.left_edge.i, word.right_edge.i + 1, np_label
         elif word.dep == conj:
             head = word.head
@@ -47,10 +44,7 @@ def noun_chunks(obj):
                 head = head.head
             # If the head is an NP, and we're coordinated to it, we're an NP
             if head.dep in np_deps:
-                w_range = range(word.left_edge.i, word.right_edge.i + 1)
+                prev_end = word.right_edge.i + 1
-                if any(j in seen for j in w_range):
-                    continue
-                seen.update(j for j in w_range)
                 yield word.left_edge.i, word.right_edge.i + 1, np_label