Use PeriExpl instead of PeriRefl

Author: lenka-krippnerova

udapi/block/msf/slavic/conditional.py

@@ -44,7 +44,7 @@ def process_node(self, node):
 					mood='Cnd',
 					form='Fin',
 					aspect=node.feats['Aspect'],
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					polarity=self.get_polarity(phrase_nodes),
 					voice=self.get_voice(node, refl),
 					ords=phrase_ords,
@@ -78,7 +78,7 @@ def process_node(self, node):
 					form='Fin',
 					voice=self.get_voice(copVerb, refl),
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node, refl),
+					expl=self.get_expl_type(node, refl),
 					ords=phrase_ords,
 					gender=copVerb.feats['Gender'],
 					animacy=copVerb.feats['Animacy']

udapi/block/msf/slavic/converb.py

@@ -27,7 +27,7 @@ def process_node(self, node):
 				tense=node.feats['Tense'],
 				aspect=node.feats['Aspect'],
 				polarity=self.get_polarity(phrase_nodes),
-				reflex=self.get_is_reflex(node,refl),
+				expl=self.get_expl_type(node,refl),
 				ords=phrase_ords,
 				gender=node.feats['Gender'],
 				animacy=node.feats['Animacy'],

udapi/block/msf/slavic/future.py

@@ -34,7 +34,7 @@ def process_node(self, node):
 					aspect=node.feats['Aspect'], # srbstina ani chorvatstina vidy nema
 					form='Fin',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					gender=node.feats['Gender'],
 					animacy=node.feats['Animacy'],
 					ords=phrase_ords
@@ -54,7 +54,7 @@ def process_node(self, node):
 					aspect=node.feats['Aspect'], 
 					form='Fin',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					gender=node.feats['Gender'],
 					animacy=node.feats['Animacy'],
 					ords=phrase_ords
@@ -85,15 +85,15 @@ def process_node(self, node):
 				aspect=node.feats['Aspect'],
 				form='Fin',
 				polarity=self.get_polarity(phrase_nodes),
-				reflex=self.get_is_reflex(node,refl),
+				expl=self.get_expl_type(node,refl),
 				ords=phrase_ords
 				)
 			return
 
 		# future tense of perfect verbs
 		# Upper Sorbian forms the future tense in this way, however, the feats[Aspect] are not listed in the data
 		# in some languages ​​(e.g. in Russian) these verbs have the Tense Fut, in others (e.g. in Czech) they have the Tense Pres
-		"""if node.feats['Aspect'] == 'Perf' and (node.feats['Tense'] == 'Pres' or node.feats['Tense'] == 'Fut') and node.feats['VerbForm'] != 'Conv':
+		if node.feats['Aspect'] == 'Perf' and (node.feats['Tense'] == 'Pres' or node.feats['Tense'] == 'Fut') and node.feats['VerbForm'] != 'Conv':
 			refl = [x for x in node.children if x.feats['Reflex'] == 'Yes' and x.udeprel == 'expl']
 
 			phrase_nodes = [node] + refl
@@ -112,10 +112,10 @@ def process_node(self, node):
 				form='Fin',
 				aspect='Perf',
 				polarity=self.get_polarity(phrase_nodes),
-				reflex=self.get_is_reflex(node,refl),
+				expl=self.get_expl_type(node,refl),
 				ords=phrase_ords
 				)
-			return"""
+			return
 
 
 		# future tense of imperfect verbs and passive voice
@@ -145,7 +145,7 @@ def process_node(self, node):
 					aspect=node.feats['Aspect'],
 					form='Fin',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					ords=phrase_ords,
 					gender=node.feats['Gender'],
 					animacy=node.feats['Animacy']
@@ -166,7 +166,7 @@ def process_node(self, node):
 					aspect=node.feats['Aspect'],
 					form='Fin',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					ords=phrase_ords
 					)
 				return

udapi/block/msf/slavic/imperative.py

@@ -28,7 +28,7 @@ def process_node(self, node):
 				form='Fin',
 				voice='Act',
 				polarity=self.get_polarity(phrase_nodes),
-				reflex=self.get_is_reflex(node,refl),
+				expl=self.get_expl_type(node,refl),
 				ords=phrase_ords
 				)
 			return
@@ -80,7 +80,7 @@ def process_node(self, node):
 				mood='Imp',
 				form='Fin',
 				voice=self.get_voice(copVerb, refl),
-				reflex=self.get_is_reflex(node, refl),
+				expl=self.get_expl_type(node, refl),
 				polarity=self.get_polarity(phrase_nodes),
 				ords=phrase_ords
 				)

udapi/block/msf/slavic/infinitive.py

@@ -27,7 +27,7 @@ def process_node(self,node):
 					voice=self.get_voice(node,refl),
 					form='Inf',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					ords=phrase_ords
 				)
 				return
@@ -50,7 +50,7 @@ def process_node(self,node):
 					voice='Pass',
 					form='Inf',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node, refl),
+					expl=self.get_expl_type(node, refl),
 					ords=phrase_ords,
 					gender=node.feats['Gender'],
 					animacy=node.feats['Animacy'],
@@ -78,7 +78,7 @@ def process_node(self,node):
 				voice=self.get_voice(cop[0], refl),
 				form='Inf',
 				polarity=self.get_polarity(phrase_nodes),
-				reflex=self.get_is_reflex(node, refl),
+				expl=self.get_expl_type(node, refl),
 				ords=phrase_ords
 				)
 
@@ -98,6 +98,6 @@ def process_node(self,node):
 					voice='Act',
 					form='Sup',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node, refl),
+					expl=self.get_expl_type(node, refl),
 					ords=phrase_ords
 					)

udapi/block/msf/slavic/past.py

@@ -46,7 +46,7 @@ def process_node(self, node):
 						aspect=node.feats['Aspect'],
 						form=node.feats['VerbForm'],
 						polarity=self.get_polarity(phrase_nodes),
-						reflex=self.get_is_reflex(node,refl),
+						expl=self.get_expl_type(node,refl),
 						ords=phrase_ords,
 						gender=node.feats['Gender'],
 						animacy=node.feats['Animacy']
@@ -93,7 +93,7 @@ def process_node(self, node):
 						aspect=node.feats['Aspect'],
 						form='Fin',
 						polarity=self.get_polarity(phrase_nodes),
-						reflex=self.get_is_reflex(node,refl),
+						expl=self.get_expl_type(node,refl),
 						ords=phrase_ords,
 						gender=node.feats['Gender'],
 						animacy=node.feats['Animacy']
@@ -127,7 +127,7 @@ def process_node(self, node):
 					aspect=node.feats['Aspect'],
 					form=node.feats['VerbForm'],
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					ords=phrase_ords,
 					gender=node.feats['Gender'],
 					animacy=node.feats['Animacy']
@@ -199,7 +199,7 @@ def process_node(self, node):
 					mood='Ind',
 					voice=self.get_voice(cop[0], refl),
 					form='Fin',
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					polarity=self.get_polarity(phrase_nodes),
 					ords=phrase_ords,
 					gender=cop[0].feats['Gender'],

udapi/block/msf/slavic/present.py

@@ -11,7 +11,7 @@ class Present(udapi.block.msf.phrase.Phrase):
 	def process_node(self,node):
 		# the condition VerbForm == 'Fin' ensures that there are no transgressives between the found verbs
 		# the aspect is not always given in Czech treebanks, so we can't rely on the fact that the imperfect aspect is specified 
-		if node.feats['Tense'] == 'Pres' and node.upos == 'VERB' and node.feats['VerbForm'] == 'Fin': #and node.feats['Aspect']=='Imp': 
+		if node.feats['Tense'] == 'Pres' and node.upos == 'VERB' and node.feats['VerbForm'] == 'Fin' and node.feats['Aspect'] !='Perf': 
 
 			aux_forb = [x for x in node.children if x.upos == 'AUX' and (x.lemma == 'ќе' or x.lemma == 'ще' or x.feats['Mood'] == 'Cnd')] # forbidden auxiliaries for present tense (these auxiliaries are used for the future tense or the conditional mood)
 
@@ -34,7 +34,7 @@ def process_node(self,node):
 					voice=self.get_voice(node,refl),
 					form='Fin',
 					polarity=self.get_polarity(phrase_nodes),
-					reflex=self.get_is_reflex(node,refl),
+					expl=self.get_expl_type(node,refl),
 					ords=phrase_ords
 					)
 				return
@@ -91,7 +91,7 @@ def process_node(self,node):
 					number=node.feats['Number'],
 					form='Part',
 					voice=self.get_voice(node, refl),
-					reflex=self.get_is_reflex(node, refl),
+					expl=self.get_expl_type(node, refl),
 					polarity=self.get_polarity(phrase_nodes),
 					ords=phrase_ords
 				)
@@ -122,7 +122,7 @@ def process_node(self,node):
 					mood='Ind',
 					form='Fin',
 					voice=self.get_voice(copVerb, refl),
-					reflex=self.get_is_reflex(node, refl),
+					expl=self.get_expl_type(node, refl),
 					polarity=self.get_polarity(phrase_nodes),
 					ords=phrase_ords
 				)