Skip to content

Update positions of empty nodes when regular nodes are shifted. #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 10, 2023
Merged

Update positions of empty nodes when regular nodes are shifted. #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9760e69
Update positions of empty nodes when regular nodes are shifted.
dan-zeman Jul 1, 2023
e5b5186
A new block to survey fixed multiword expressions in UD treebanks.
dan-zeman Sep 19, 2023
a4a183d
Added missing article features to Greek AddMwt.
dan-zeman Oct 12, 2023
9af81d5
Merge branch 'master' into fix_shift_edeps
martinpopel Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions udapi/block/ud/el/addmwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
import udapi.block.ud.addmwt

MWTS = {
'στη': {'form': 'σ τη', 'feats': '_ Case=Acc|Gender=Fem|Number=Sing'},
'στην': {'form': 'σ την', 'feats': '_ Case=Acc|Gender=Fem|Number=Sing'},
'στα': {'form': 'σ τα', 'feats': '_ Case=Acc|Gender=Neut|Number=Plur'},
'στους': {'form': 'σ τους', 'feats': '_ Case=Acc|Gender=Masc|Number=Plur'},
'στις': {'form': 'σ τις', 'feats': '_ Case=Acc|Gender=Fem|Number=Plur'},
'στον': {'form': 'σ τον', 'feats': '_ Case=Acc|Gender=Masc|Number=Sing'},
'στο': {'form': 'σ το', 'feats': '_ Case=Acc|Gender=*|Number=Sing'},
'στη': {'form': 'σ τη', 'feats': '_ Case=Acc|Definite=Def|Gender=Fem|Number=Sing|PronType=Art'},
'στην': {'form': 'σ την', 'feats': '_ Case=Acc|Definite=Def|Gender=Fem|Number=Sing|PronType=Art'},
'στα': {'form': 'σ τα', 'feats': '_ Case=Acc|Definite=Def|Gender=Neut|Number=Plur|PronType=Art'},
'στους': {'form': 'σ τους', 'feats': '_ Case=Acc|Definite=Def|Gender=Masc|Number=Plur|PronType=Art'},
'στις': {'form': 'σ τις', 'feats': '_ Case=Acc|Definite=Def|Gender=Fem|Number=Plur|PronType=Art'},
'στον': {'form': 'σ τον', 'feats': '_ Case=Acc|Definite=Def|Gender=Masc|Number=Sing|PronType=Art'},
'στο': {'form': 'σ το', 'feats': '_ Case=Acc|Definite=Def|Gender=*|Number=Sing|PronType=Art'},
}

# shared values for all entries in MWTS
Expand Down
11 changes: 11 additions & 0 deletions udapi/core/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@ def remove(self, children=None):
def _shift_before_ord(self, reference_ord, without_children=False):
"""Internal method for changing word order."""
all_nodes = self._root._descendants
empty_nodes = self._root.empty_nodes

# Moving a single node can be faster than nodes_to_move = [self]
if without_children or not self._children:
Expand All @@ -584,15 +585,25 @@ def _shift_before_ord(self, reference_ord, without_children=False):
all_nodes[i_ord - 1]._ord = i_ord
all_nodes[reference_ord - 2] = self
self._ord = reference_ord - 1
for en in empty_nodes:
if en._ord > my_ord and en._ord < reference_ord:
en._ord -= 1
elif reference_ord < my_ord:
for i_ord in range(my_ord, reference_ord, -1):
all_nodes[i_ord - 1] = all_nodes[i_ord - 2]
all_nodes[i_ord - 1]._ord = i_ord
all_nodes[reference_ord - 1] = self
self._ord = reference_ord
for en in empty_nodes:
# Empty nodes before the first overt token (ID=0.X) will be never moved this way.
# We cannot know whether the caller wanted to place the shifted node before or after them.
if en._ord < my_ord and en._ord > reference_ord:
en._ord += 1
self._parent._children.sort()
return

#TODO: Updating ords of empty nodes is implemented only for the simple case above,
# but it has to be implemented also for the complex case below!
nodes_to_move = self.descendants(add_self=True)
first_ord, last_ord = nodes_to_move[0]._ord, nodes_to_move[-1]._ord

Expand Down