From 14ad2abd30c37f9fabd5e2f799860a5ab7794d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Lamercerie?=
 <aurelien.lamercerie@tetras-libre.fr>
Date: Thu, 21 Sep 2023 12:23:48 +0200
Subject: [PATCH] Update to class individuals as entity

---
 .../amr_master_rule/owl_generation/owl_individual_generator.py | 2 +-
 .../transduction/heuristic_deducer/relation_deducer_1.py       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tenet/scheme/amr_master_rule/owl_generation/owl_individual_generator.py b/tenet/scheme/amr_master_rule/owl_generation/owl_individual_generator.py
index 1da9f260..b7366dc2 100644
--- a/tenet/scheme/amr_master_rule/owl_generation/owl_individual_generator.py
+++ b/tenet/scheme/amr_master_rule/owl_generation/owl_individual_generator.py
@@ -171,7 +171,7 @@ def __generate_owl_typing_relation(graph, new_individual_uri, net):
             if predicat is not None:
                 triple_list.append((new_individual_uri, relation, predicat))
                 
-    elif net.class_type:
+    if net.class_type:
         predicat = __compute_class_type_uri(net)
         triple_list.append((new_individual_uri, relation, predicat))
         
diff --git a/tenet/scheme/amr_master_rule/transduction/heuristic_deducer/relation_deducer_1.py b/tenet/scheme/amr_master_rule/transduction/heuristic_deducer/relation_deducer_1.py
index b8efc292..e39488fb 100644
--- a/tenet/scheme/amr_master_rule/transduction/heuristic_deducer/relation_deducer_1.py
+++ b/tenet/scheme/amr_master_rule/transduction/heuristic_deducer/relation_deducer_1.py
@@ -22,6 +22,8 @@ from transduction.naming_computer import (
     define_relation_naming
     )
 
+ENTITY_CLASS_TYPE = 'base-out:Entity'
+
 
 #==============================================================================
 # Pattern Search: 
@@ -149,6 +151,7 @@ def __construct_individual_net(graph, mother_class_net):
     structure_ref = __get_structure(graph)
     individual_net.individual_label = __define_individual_label(root_class_net, structure_ref)
     individual_net.structure = structure_ref
+    individual_net.class_type = ENTITY_CLASS_TYPE
     
     # -- Mother classes
     mother_class_net_list = [mother_class_net.uri]
-- 
GitLab