From 2b1e1e566303d2feebbff835216b028cf5421ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Lamercerie?=
 <aurelien.lamercerie@laposte.net>
Date: Mon, 30 Aug 2021 13:10:36 +0200
Subject: [PATCH] =?UTF-8?q?Fix:=20Ex=C3=A9cution=20lente=20sur=20la=20r?=
 =?UTF-8?q?=C3=A8gle=20d'extraction=20106?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/transduction-schemes.ttl | 58 ++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/config/transduction-schemes.ttl b/config/transduction-schemes.ttl
index f6ba5cf3..e1026079 100644
--- a/config/transduction-schemes.ttl
+++ b/config/transduction-schemes.ttl
@@ -275,13 +275,6 @@ CONSTRUCT {
    ?newNet net:class2 ?concept3.	
 }
 WHERE {
-   # UW: type UW-Occurrence and substructure of req sentence
-   ?uw1 rdf:type unl:UW_Occurrence.
-   ?uw2 rdf:type unl:UW_Occurrence.
-   ?uw3 rdf:type unl:UW_Occurrence.
-   ?uw1 unl:is_substructure_of ?req.
-   ?uw2 unl:is_substructure_of ?req.
-   ?uw3 unl:is_substructure_of ?req.
    # net1: entity
    ?net1 a net:Instance.
    ?net1 net:type net:entity.
@@ -295,8 +288,17 @@ WHERE {
    ?net2 net:node ?uw3.
    ?net2 net:featureClass ?featureClass.
    ?net2 net:concept ?subComplement.	
+   # Filter
+   FILTER ( ?uw1 != ?uw3  ).
    # condition: mod(net1, net2)
    ?uw1 unl:mod ?uw2.
+   # UW: type UW-Occurrence and substructure of req sentence
+   ?uw1 rdf:type unl:UW_Occurrence.
+   ?uw2 rdf:type unl:UW_Occurrence.
+   ?uw3 rdf:type unl:UW_Occurrence.
+   ?uw1 unl:is_substructure_of ?req.
+   ?uw2 unl:is_substructure_of ?req.
+   ?uw3 unl:is_substructure_of ?req.
    # Label(s) / URI
    ?uw2 rdfs:label ?uw2Label.
    ?uw3 rdfs:label ?uw3Label.
@@ -309,8 +311,6 @@ WHERE {
    BIND (concat( ?netURI, ?classListLabel, '_') AS ?s1).
    BIND (concat(?s1, ?mainEntity, '-', ?concept2) AS ?s2).
    BIND (uri(?s2) AS ?newNet).
-   # Filter
-   FILTER ( ?uw1 != ?uw3  ).
 }""" ;
   sh:order "106"^^xsd:decimal ;
 .
@@ -340,13 +340,6 @@ CONSTRUCT {
    ?newNet net:class2 ?concept3.	
 }
 WHERE {
-   # UW: type UW-Occurrence and substructure of req sentence
-   ?uw1 rdf:type unl:UW_Occurrence.
-   ?uw2 rdf:type unl:UW_Occurrence.
-   ?uw3 rdf:type unl:UW_Occurrence.
-   ?uw1 unl:is_substructure_of ?req.
-   ?uw2 unl:is_substructure_of ?req.
-   ?uw3 unl:is_substructure_of ?req.
    # net1: agent
    ?net1 a net:Instance.
    ?net1 net:type net:entity.
@@ -359,8 +352,17 @@ WHERE {
    ?net2 net:node ?uw2.
    ?net2 net:node ?uw3.
    ?net2 net:entityClass ?entityClass2.
+   # Filter
+   FILTER ( ?uw1 != ?uw3  ).
    # condition: mod(net1, net2)
    ?uw1 unl:mod ?uw2.
+   # UW: type UW-Occurrence and substructure of req sentence
+   ?uw1 rdf:type unl:UW_Occurrence.
+   ?uw2 rdf:type unl:UW_Occurrence.
+   ?uw3 rdf:type unl:UW_Occurrence.
+   ?uw1 unl:is_substructure_of ?req.
+   ?uw2 unl:is_substructure_of ?req.
+   ?uw3 unl:is_substructure_of ?req.
    # Label(s) / URI
    ?uw2 rdfs:label ?uw2Label.
    ?uw3 rdfs:label ?uw3Label.
@@ -373,8 +375,6 @@ WHERE {
    BIND (concat( ?netURI, ?classListLabel, '_') AS ?s1).
    BIND (concat(?s1, ?mainEntity, '-', ?concept2) AS ?s2).
    BIND (uri(?s2) AS ?newNet).
-   # Filter
-   FILTER ( ?uw1 != ?uw3  ).
 }""" ;
   sh:order "107"^^xsd:decimal ;
 .
@@ -510,17 +510,17 @@ CONSTRUCT {
    ?semNet net:concept ?concept2.
 }
 WHERE {
-   # UW: type UW-Occurrence and substructure of req sentence
-   ?uw1 rdf:type unl:UW_Occurrence.
-   ?uw2 rdf:type unl:UW_Occurrence.
-   ?uw1 unl:is_substructure_of ?req.
-   ?uw2 unl:is_substructure_of ?req.
    # selection: modList net
    ?semNet a net:Instance.
    ?semNet net:type net:mod_list.
    ?semNet net:node ?uw1.
    # extension: disjunction of UW
    ?uw1 (unl:or|unl:and) ?uw2.
+   # UW: type UW-Occurrence and substructure of req sentence
+   ?uw1 rdf:type unl:UW_Occurrence.
+   ?uw2 rdf:type unl:UW_Occurrence.
+   ?uw1 unl:is_substructure_of ?req.
+   ?uw2 unl:is_substructure_of ?req.
    # Label(s) / URI
    ?uw1 rdfs:label ?uw1Label.
    ?uw2 rdfs:label ?uw2Label.
@@ -675,13 +675,13 @@ WHERE {
    ?entity rdf:type fprm:System_Entity.
    ?entity fprm:class ?entityClass.
    ?entity fprm:restriction ?entityRestriction.
-   # UW: type UW-Occurrence and substructure of req sentence
-   ?uw1 rdf:type unl:UW_Occurrence.
-   ?uw1 unl:is_substructure_of ?req.
    # net: modList
    ?semNet a net:Instance.
    ?semNet net:type net:mod_list.
    ?semNet net:node ?uw1.
+   # UW: type UW-Occurrence and substructure of req sentence
+   ?uw1 rdf:type unl:UW_Occurrence.
+   ?uw1 unl:is_substructure_of ?req.
    # Label(s) / URI
    ?uw1 rdfs:label ?uw1Label.
    # Filter
@@ -712,13 +712,13 @@ WHERE {
    ?entity rdf:type fprm:System_Feature.
    ?entity fprm:class ?featureClass.
    ?entity fprm:restriction ?featureRestriction.
-   # UW: type UW-Occurrence and substructure of req sentence
-   ?uw1 rdf:type unl:UW_Occurrence.
-   ?uw1 unl:is_substructure_of ?req.
    # net: modList
    ?semNet a net:Instance.
    ?semNet net:type net:mod_list.
    ?semNet net:node ?uw1.
+   # UW: type UW-Occurrence and substructure of req sentence
+   ?uw1 rdf:type unl:UW_Occurrence.
+   ?uw1 unl:is_substructure_of ?req.
    # Label(s) / URI
    ?uw1 rdfs:label ?uw1Label.
    # Filter
-- 
GitLab