Update to class individuals as entity

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))
         

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]