eyeling 1.13.2 → 1.13.4

package/examples/odrl-dpv-risk-ranked.n3

@@ -25,7 +25,7 @@
 # - N3 spec:          https://w3c.github.io/N3/spec/
 # - Eyeling builtins: https://eyereasoner.github.io/eyeling/HANDBOOK#ch11
 # - ODRL vocab:       https://www.w3.org/TR/odrl-vocab/
-# - DPV risk module:  https://w3c.github.io/dpv/2.0/dpv/modules/risk.html
+# - DPV risk module:  https://dev.dpvcg.org/dpv/modules/risk
 # - DPV-RISK:         https://w3id.org/dpv/risk
 # ===========================================================================================
 
@@ -34,7 +34,6 @@
 @prefix dpv:   <https://w3id.org/dpv#> .
 @prefix risk:  <https://w3id.org/dpv/risk#> .
 @prefix dct:   <http://purl.org/dc/terms/> .
-@prefix xsd:   <http://www.w3.org/2001/XMLSchema#> .
 @prefix log:   <http://www.w3.org/2000/10/swap/log#> .
 @prefix math:  <http://www.w3.org/2000/10/swap/math#> .
 @prefix string:<http://www.w3.org/2000/10/swap/string#> .
@@ -44,7 +43,7 @@
 # 1) Consumer profile (needs)
 # ---------------------------
 
-:ConsumerExample a :ConsumerProfile ;
+:ConsumerExample a :ConsumerProfile, odrl:Party ;
   dct:title "Example consumer profile" ;
   :hasNeed :Need_DataCannotBeRemoved,
            :Need_ChangeOnlyWithPriorNotice,
@@ -52,20 +51,20 @@
            :Need_DataPortability .
 
 :Need_DataCannotBeRemoved a :Need ;
-  :importance "20"^^xsd:integer ;
+  :importance 20 ;
   dct:description "Provider must not remove the consumer account/data." .
 
 :Need_ChangeOnlyWithPriorNotice a :Need ;
-  :importance "15"^^xsd:integer ;
-  :minNoticeDays "14"^^xsd:integer ;
+  :importance 15 ;
+  :minNoticeDays 14 ;
   dct:description "Agreement may change only with prior notice (>= 14 days)." .
 
 :Need_NoSharingWithoutConsent a :Need ;
-  :importance "12"^^xsd:integer ;
+  :importance 12 ;
   dct:description "No data sharing without explicit consent." .
 
 :Need_DataPortability a :Need ;
-  :importance "10"^^xsd:integer ;
+  :importance 10 ;
   dct:description "Consumer must be able to export their data." .
 
 # ------------------------------------------
@@ -84,7 +83,7 @@
     # Clause C1: remove account/data without safeguards
     :PermDeleteAccount a odrl:Permission ;
       odrl:assigner :Provider ;
-      odrl:assignee odrl:consumer ;
+      odrl:assignee :ConsumerExample ;
       odrl:action tosl:removeAccount ;
       odrl:target :UserAccount ;
       :clause :ClauseC1 .
@@ -92,7 +91,7 @@
     # Clause C2: change terms with noticeDays >= 3 (may be too short for the consumer)
     :PermChangeTerms a odrl:Permission ;
       odrl:assigner :Provider ;
-      odrl:assignee odrl:consumer ;
+      odrl:assignee :ConsumerExample ;
       odrl:action tosl:changeTerms ;
       odrl:target :AgreementText ;
       odrl:duty [
@@ -102,7 +101,7 @@
           a odrl:Constraint ;
           odrl:leftOperand tosl:noticeDays ;
           odrl:operator odrl:gteq ;
-          odrl:rightOperand "3"^^xsd:integer
+          odrl:rightOperand 3
         ]
       ] ;
       :clause :ClauseC2 .
@@ -110,7 +109,7 @@
     # Clause C3: share data without explicit consent safeguard
     :PermShareData a odrl:Permission ;
       odrl:assigner :Provider ;
-      odrl:assignee odrl:consumer ;
+      odrl:assignee :ConsumerExample ;
       odrl:action tosl:shareData ;
       odrl:target :UserData ;
       :clause :ClauseC3 .
@@ -118,7 +117,7 @@
     # Clause C4: prohibit export (hurts portability)
     :ProhibitExportData a odrl:Prohibition ;
       odrl:assigner :Provider ;
-      odrl:assignee odrl:consumer ;
+      odrl:assignee :ConsumerExample ;
       odrl:action tosl:exportData ;
       odrl:target :UserData ;
       :clause :ClauseC4 .
@@ -167,6 +166,8 @@
   (90 ?w) math:sum ?raw .
   ( :Agreement1 :ConsumerExample :DeleteAccountNoSafeguards ?cid ) log:skolem ?risk .
   ( :Agreement1 :ConsumerExample :DeleteAccountNoSafeguardsSource ?cid ) log:skolem ?src .
+  ( ?risk :M1 ) log:skolem ?m1 .
+  ( ?risk :M2 ) log:skolem ?m2 .
 
   ( "Risk: account/data removal is permitted without notice safeguards (no notice constraint and no duty to inform). Clause %s: %s"
     ?cid ?txt ) string:format ?why .
@@ -189,8 +190,6 @@
 
   :ProcessContext1 dpv:hasRisk ?risk .
 
-  ( ?risk :M1 ) log:skolem ?m1 .
-  ( ?risk :M2 ) log:skolem ?m2 .
 
   ?m1 a dpv:RiskMitigationMeasure ;
     dct:description "Add a notice constraint (minimum noticeDays) before account removal." ;
@@ -200,7 +199,7 @@
         a odrl:Constraint ;
         odrl:leftOperand tosl:noticeDays ;
         odrl:operator odrl:gteq ;
-        odrl:rightOperand "14"^^xsd:integer
+        odrl:rightOperand 14
       ] .
     } .
 
@@ -242,6 +241,7 @@
   (70 ?w) math:sum ?raw .
   ( :Agreement1 :ConsumerExample :NoticeTooShort ?cid ) log:skolem ?risk .
   ( :Agreement1 :ConsumerExample :NoticeTooShortSource ?cid ) log:skolem ?src .
+  ( ?risk :M1 ) log:skolem ?m1 .
 
   ( "Risk: terms may change with notice (%s days) below consumer requirement (%s days). Clause %s: %s"
     ?days ?req ?cid ?txt ) string:format ?why .
@@ -264,7 +264,6 @@
 
   :ProcessContext1 dpv:hasRisk ?risk .
 
-  ( ?risk :M1 ) log:skolem ?m1 .
   ?m1 a dpv:RiskMitigationMeasure ;
     dct:description "Increase minimum noticeDays in the inform duty to meet the consumer requirement." ;
     dpv:mitigatesRisk ?risk ;
@@ -276,7 +275,7 @@
           a odrl:Constraint ;
           odrl:leftOperand tosl:noticeDays ;
           odrl:operator odrl:gteq ;
-          odrl:rightOperand "14"^^xsd:integer
+          odrl:rightOperand 14
         ]
       ] .
     } .
@@ -309,6 +308,7 @@
   (85 ?w) math:sum ?raw .
   ( :Agreement1 :ConsumerExample :ShareNoConsent ?cid ) log:skolem ?risk .
   ( :Agreement1 :ConsumerExample :ShareNoConsentSource ?cid ) log:skolem ?src .
+  ( ?risk :M1 ) log:skolem ?m1 .
 
   ( "Risk: user data sharing is permitted without an explicit consent constraint. Clause %s: %s"
     ?cid ?txt ) string:format ?why .
@@ -331,7 +331,6 @@
 
   :ProcessContext1 dpv:hasRisk ?risk .
 
-  ( ?risk :M1 ) log:skolem ?m1 .
   ?m1 a dpv:RiskMitigationMeasure ;
     dct:description "Add an explicit consent constraint before data sharing." ;
     dpv:mitigatesRisk ?risk ;
@@ -364,6 +363,7 @@
   (60 ?w) math:sum ?raw .
   ( :Agreement1 :ConsumerExample :NoPortability ?cid ) log:skolem ?risk .
   ( :Agreement1 :ConsumerExample :NoPortabilitySource ?cid ) log:skolem ?src .
+  ( ?risk :M1 ) log:skolem ?m1 .
 
   ( "Risk: portability is restricted because exporting user data is prohibited. Clause %s: %s"
     ?cid ?txt ) string:format ?why .
@@ -386,7 +386,6 @@
 
   :ProcessContext1 dpv:hasRisk ?risk .
 
-  ( ?risk :M1 ) log:skolem ?m1 .
   ?m1 a dpv:RiskMitigationMeasure ;
     dct:description "Add a permission allowing data export (or remove the prohibition) to support portability." ;
     dpv:mitigatesRisk ?risk ;
@@ -394,7 +393,7 @@
       :Policy1 odrl:permission [
         a odrl:Permission ;
         odrl:assigner :Provider ;
-        odrl:assignee odrl:consumer ;
+        odrl:assignee :ConsumerExample ;
         odrl:action tosl:exportData ;
         odrl:target :UserData
       ] .
@@ -407,19 +406,19 @@
 # 4) Score normalization + DPV-RISK severity/level
 # ------------------------------------------------
 
-{ ?r a dpv:Risk ; :scoreRaw ?raw . ?raw math:greaterThan "100"^^xsd:integer . }
-=> { ?r :score "100"^^xsd:integer . } .
+{ ?r a dpv:Risk ; :scoreRaw ?raw . ?raw math:greaterThan 100 . }
+=> { ?r :score 100 . } .
 
-{ ?r a dpv:Risk ; :scoreRaw ?raw . "100"^^xsd:integer math:notLessThan ?raw . }
+{ ?r a dpv:Risk ; :scoreRaw ?raw . 100 math:notLessThan ?raw . }
 => { ?r :score ?raw . } .
 
-{ ?r a dpv:Risk ; :score ?s . ?s math:greaterThan "79"^^xsd:integer . }
+{ ?r a dpv:Risk ; :score ?s . ?s math:greaterThan 79 . }
 => { ?r dpv:hasSeverity risk:HighSeverity ; dpv:hasRiskLevel risk:HighRisk . } .
 
-{ ?r a dpv:Risk ; :score ?s . ?s math:lessThan "80"^^xsd:integer . ?s math:greaterThan "49"^^xsd:integer . }
+{ ?r a dpv:Risk ; :score ?s . ?s math:lessThan 80 . ?s math:greaterThan 49 . }
 => { ?r dpv:hasSeverity risk:ModerateSeverity ; dpv:hasRiskLevel risk:ModerateRisk . } .
 
-{ ?r a dpv:Risk ; :score ?s . ?s math:lessThan "50"^^xsd:integer . }
+{ ?r a dpv:Risk ; :score ?s . ?s math:lessThan 50 . }
 => { ?r dpv:hasSeverity risk:LowSeverity ; dpv:hasRiskLevel risk:LowRisk . } .
 
 # ------------------------------------------------------------------------------
@@ -448,14 +447,14 @@
      dct:description ?why .
   ?clause :clauseId ?cid .
 
-  ( "1000"^^xsd:integer ?score ) math:difference ?inv .
+  ( 1000 ?score ) math:difference ?inv .
 
   ( "score=%s (%s, %s)  clause %s\n  %s\n\n"
     ?score ?lvl ?sev ?cid ?why ) string:format ?line .
 }
 =>
 {
-  ( :Agreement1 :ConsumerExample 1 ?inv ?r ) log:outputString ?line .
+  ( :Agreement1 :ConsumerExample 1 ?inv ?cid 0 ?r ) log:outputString ?line .
 } .
 
 # Mitigation lines (same ordering as their risk)
@@ -467,13 +466,13 @@
   ?clause :clauseId ?cid .
   ?m dct:description ?md .
 
-  ( "1000"^^xsd:integer ?score ) math:difference ?inv .
+  ( 1000 ?score ) math:difference ?inv .
 
   ( "  - mitigation for clause %s: %s\n"
     ?cid ?md ) string:format ?mline .
 }
 =>
 {
-  ( :Agreement1 :ConsumerExample 2 ?inv ?r ) log:outputString ?mline .
+  ( :Agreement1 :ConsumerExample 1 ?inv ?cid 1 ?r ?m ) log:outputString ?mline .
 } .
 

package/examples/output/allen-interval-calculus.n3

@@ -0,0 +1,157 @@
+@prefix : <http://example.org/allen#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:I :end "2026-02-18T18:00:00+00:00"^^xsd:dateTime .
+:K :end "2026-02-18T14:00:00+00:00"^^xsd:dateTime .
+:I :start "2026-02-18T16:00:00+00:00"^^xsd:dateTime .
+:K :start "2026-02-18T13:30:00+00:00"^^xsd:dateTime .
+:A :duration "PT7200S"^^xsd:duration .
+:B :duration "PT7200S"^^xsd:duration .
+:C :duration "PT7200S"^^xsd:duration .
+:D :duration "PT7200S"^^xsd:duration .
+:E :duration "PT7200S"^^xsd:duration .
+:F :duration "PT3600S"^^xsd:duration .
+:G :duration "PT3600S"^^xsd:duration .
+:H :duration "PT25200S"^^xsd:duration .
+:I :duration "PT7200S"^^xsd:duration .
+:J :duration "PT3600S"^^xsd:duration .
+:K :duration "PT1800S"^^xsd:duration .
+:A :before :B .
+:A :before :I .
+:A :before :J .
+:A :before :K .
+:B :before :I .
+:C :before :I .
+:C :before :J .
+:D :before :I .
+:D :before :J .
+:D :before :K .
+:E :before :B .
+:E :before :I .
+:E :before :J .
+:E :before :K .
+:F :before :B .
+:F :before :C .
+:F :before :I .
+:F :before :J .
+:F :before :K .
+:G :before :B .
+:G :before :I .
+:G :before :J .
+:G :before :K .
+:K :before :I .
+:K :before :J .
+:A :meets :C .
+:B :meets :J .
+:D :meets :B .
+:E :meets :C .
+:F :meets :D .
+:F :meets :G .
+:G :meets :C .
+:H :meets :I .
+:J :meets :I .
+:A :overlaps :D .
+:C :overlaps :B .
+:D :overlaps :C .
+:E :overlaps :D .
+:F :starts :A .
+:F :starts :E .
+:G :starts :D .
+:A :during :H .
+:B :during :H .
+:C :during :H .
+:D :during :H .
+:E :during :H .
+:F :during :H .
+:G :during :H .
+:K :during :B .
+:K :during :H .
+:G :finishes :A .
+:G :finishes :E .
+:J :finishes :H .
+:A :equals :A .
+:A :equals :E .
+:B :equals :B .
+:C :equals :C .
+:D :equals :D .
+:E :equals :A .
+:E :equals :E .
+:F :equals :F .
+:G :equals :G .
+:H :equals :H .
+:I :equals :I .
+:J :equals :J .
+:K :equals :K .
+:B :after :A .
+:I :after :A .
+:J :after :A .
+:K :after :A .
+:I :after :B .
+:I :after :C .
+:J :after :C .
+:I :after :D .
+:J :after :D .
+:K :after :D .
+:B :after :E .
+:I :after :E .
+:J :after :E .
+:K :after :E .
+:B :after :F .
+:C :after :F .
+:I :after :F .
+:J :after :F .
+:K :after :F .
+:B :after :G .
+:I :after :G .
+:J :after :G .
+:K :after :G .
+:I :after :K .
+:J :after :K .
+:C :metBy :A .
+:J :metBy :B .
+:B :metBy :D .
+:C :metBy :E .
+:D :metBy :F .
+:G :metBy :F .
+:C :metBy :G .
+:I :metBy :H .
+:I :metBy :J .
+:D :overlappedBy :A .
+:B :overlappedBy :C .
+:C :overlappedBy :D .
+:D :overlappedBy :E .
+:A :startedBy :F .
+:E :startedBy :F .
+:D :startedBy :G .
+:H :contains :A .
+:H :contains :B .
+:H :contains :C .
+:H :contains :D .
+:H :contains :E .
+:H :contains :F .
+:H :contains :G .
+:B :contains :K .
+:H :contains :K .
+:A :finishedBy :G .
+:E :finishedBy :G .
+:H :finishedBy :J .
+:A :end "2026-02-18T12:00:00+00:00"^^xsd:dateTime .
+:B :end "2026-02-18T15:00:00+00:00"^^xsd:dateTime .
+:C :end "2026-02-18T14:00:00+00:00"^^xsd:dateTime .
+:D :end "2026-02-18T13:00:00+00:00"^^xsd:dateTime .
+:E :end "2026-02-18T12:00:00+00:00"^^xsd:dateTime .
+:F :end "2026-02-18T11:00:00+00:00"^^xsd:dateTime .
+:G :end "2026-02-18T12:00:00+00:00"^^xsd:dateTime .
+:H :end "2026-02-18T16:00:00+00:00"^^xsd:dateTime .
+:J :end "2026-02-18T16:00:00+00:00"^^xsd:dateTime .
+:A :start "2026-02-18T10:00:00+00:00"^^xsd:dateTime .
+:B :start "2026-02-18T13:00:00+00:00"^^xsd:dateTime .
+:C :start "2026-02-18T12:00:00+00:00"^^xsd:dateTime .
+:D :start "2026-02-18T11:00:00+00:00"^^xsd:dateTime .
+:E :start "2026-02-18T10:00:00+00:00"^^xsd:dateTime .
+:F :start "2026-02-18T10:00:00+00:00"^^xsd:dateTime .
+:G :start "2026-02-18T11:00:00+00:00"^^xsd:dateTime .
+:H :start "2026-02-18T09:00:00+00:00"^^xsd:dateTime .
+:J :start "2026-02-18T15:00:00+00:00"^^xsd:dateTime .
+:K :finishes :C .
+:C :finishedBy :K .