diff --git a/tenet/scheme/amr_master_rule/transduction/phenomena_analyzer/degree_analyzer_1.py b/tenet/scheme/amr_master_rule/transduction/phenomena_analyzer/degree_analyzer_1.py index ec028a4181e4a47c5bc67188849a0e2aec433fab..af20c14a0c2f172e6be1d5e1fdc453645d0f4b5c 100644 --- a/tenet/scheme/amr_master_rule/transduction/phenomena_analyzer/degree_analyzer_1.py +++ b/tenet/scheme/amr_master_rule/transduction/phenomena_analyzer/degree_analyzer_1.py @@ -41,6 +41,7 @@ def __search_pattern(graph): f'?phenomena_net net:hasPhenomenaType {DEGREE_PHENOMENA_URI}.' f'?phenomena_net {ARG_RELATION[1]} ?entity_class_net.', '?entity_class_net a [rdfs:subClassOf* net:Class_Net].', + 'FILTER NOT EXISTS {{ ?entity_class_net a net:Deprecated_Net. }}', f'?phenomena_net {ARG_RELATION[2]} ?attribute_class_net.', '?attribute_class_net a [rdfs:subClassOf* net:Class_Net].', f'?phenomena_net {ARG_RELATION[3]} ?degree_property_net.', @@ -59,7 +60,8 @@ def __search_pattern(graph): def __search_degree_arg4(graph, degree_net_uri): select_data_list = ['?comparated_class_net'] clause_list = [(degree_net_uri, ARG_RELATION[4], '?comparated_class_net'), - '?comparated_class_net a [rdfs:subClassOf* net:Class_Net].'] + '?comparated_class_net a [rdfs:subClassOf* net:Class_Net].', + 'FILTER NOT EXISTS {{ ?comparated_class_net a net:Deprecated_Net. }}'] query_code = generate_select_distinct_query(graph, select_data_list, clause_list) result_set = graph.query(query_code) return query_code, result_set @@ -68,7 +70,8 @@ def __search_degree_arg4(graph, degree_net_uri): def __search_degree_arg5(graph, degree_net_uri): select_data_list = ['?superlative_class_net'] clause_list = [(degree_net_uri, ARG_RELATION[5], '?superlative_class_net'), - '?superlative_class_net a [rdfs:subClassOf* net:Class_Net].'] + '?superlative_class_net a [rdfs:subClassOf* net:Class_Net].', + 'FILTER NOT EXISTS {{ ?superlative_class_net a net:Deprecated_Net. }}'] query_code = generate_select_distinct_query(graph, select_data_list, clause_list) result_set = graph.query(query_code) return query_code, result_set @@ -77,7 +80,8 @@ def __search_degree_arg5(graph, degree_net_uri): def __search_degree_arg6(graph, degree_net_uri): select_data_list = ['?reference_net'] clause_list = [(degree_net_uri, ARG_RELATION[6], '?reference_net'), - '?reference_net a [rdfs:subClassOf* net:Class_Net].'] + '?reference_net a [rdfs:subClassOf* net:Class_Net].', + 'FILTER NOT EXISTS {{ ?reference_net a net:Deprecated_Net. }}'] query_code = generate_select_distinct_query(graph, select_data_list, clause_list) result_set = graph.query(query_code) return query_code, result_set diff --git a/tenet/scheme/owl_amr_scheme_1.py b/tenet/scheme/owl_amr_scheme_1.py index 1d2499bb971eaac27b278153910ecf7243cf8a41..895eba9c3d0832ce7f7cf196b378a1bdda729e32 100644 --- a/tenet/scheme/owl_amr_scheme_1.py +++ b/tenet/scheme/owl_amr_scheme_1.py @@ -86,8 +86,7 @@ atomic_extraction_sequence = ['atomic extraction sequence', classification_sequence_1 = ['classification sequence (1)', rule.classify_modality_phenomena, - rule.reclassify_argument_property_to_class, - rule.analyze_phenomena_degree91_1 + # rule.reclassify_argument_property_to_class, # TODO: delete this rule ] phenomena_analyze_sequence_1 = ['phenomena analyze sequence (1)', @@ -101,6 +100,7 @@ phenomena_analyze_sequence_1 = ['phenomena analyze sequence (1)', ] phenomena_analyze_sequence_2 = ['phenomena analyze sequence (2)', + rule.analyze_phenomena_degree91_1, rule.analyze_phenomena_or_1, rule.analyze_phenomena_or_2, rule.analyze_phenomena_and_1,