Skip to content

Issue 629: Catch develop-2.0.0 up to develop #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbt5 merged 16 commits into from
Mar 18, 2025
Merged

Issue 629: Catch develop-2.0.0 up to develop #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aea0c04
Demonstrate revised vocabulary pattern on types:hashMethod
ajnelson-nist Aug 13, 2024
6d385ba
Regenerate Make-managed files
ajnelson-nist Aug 13, 2024
ceaa62e
Merge branch 'develop' into BugFix-Issue-629
ajnelson-nist Oct 17, 2024
54ea222
Revise vocabulary pattern for core:ObjectStatusVocab
ajnelson-nist Oct 17, 2024
12855bf
Regenerate Make-managed files
ajnelson-nist Oct 17, 2024
5e4bd70
Merge branch 'develop' into BugFix-Issue-629
ajnelson-nist Feb 18, 2025
dc6b862
Revert addition of types:hashMethod-objects-in-shape
ajnelson-nist Feb 18, 2025
7037123
Regenerate Make-managed files
ajnelson-nist Feb 18, 2025
d7ea496
Revise test to use new vocabulary pattern
ajnelson-nist Feb 18, 2025
ed274b1
Apply revised vocabulary pattern
ajnelson-nist Feb 18, 2025
e6decb6
Regenerate Make-managed files
ajnelson-nist Feb 18, 2025
5ded259
Move sh:in review to named PropertyShapes
ajnelson-nist Feb 26, 2025
d524b8e
Regenerate Make-managed files
ajnelson-nist Feb 26, 2025
68ffd02
Fix logging syntax
ajnelson-nist Feb 26, 2025
26a1b94
Expand paths to SHACL vocabulary lists
ajnelson-nist Feb 26, 2025
eff5e3b
Merge pull request #630 from ucoProject/BugFix-Issue-629
plbt5 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 35 additions & 59 deletions ontology/uco/action/action.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ action:Action
rdfs:comment "An action is something that may be done or performed."@en ;
owl:disjointWith core:Event ;
sh:property
action:Action-actionStatus-in-shape ,
[
sh:class action:Action ;
sh:nodeKind sh:IRI ;
Expand Down Expand Up @@ -108,49 +109,36 @@ action:Action
sh:path action:actionCount ;
] ,
[
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
sh:datatype xsd:string ;
sh:message "As of UCO 1.4.0, the datatype to use for action:actionStatus should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
sh:path action:actionStatus ;
sh:severity sh:Info ;
sh:severity sh:Warning ;
] ,
[
sh:maxCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocabulary:ActionStatusTypeVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path action:actionStatus ;
] ,
[
sh:message "Value is not member of the vocabulary ActionStatusTypeVocab." ;
sh:or (
[
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:in (
"Complete/Finish"^^vocabulary:ActionStatusTypeVocab
"Error"^^vocabulary:ActionStatusTypeVocab
"Fail"^^vocabulary:ActionStatusTypeVocab
"Ongoing"^^vocabulary:ActionStatusTypeVocab
"Pending"^^vocabulary:ActionStatusTypeVocab
"Success"^^vocabulary:ActionStatusTypeVocab
"Unknown"^^vocabulary:ActionStatusTypeVocab
) ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path action:actionStatus ;
]
;
sh:targetClass action:Action ;
.

action:Action-actionStatus-in-shape
a sh:PropertyShape ;
sh:in (
"Complete/Finish"
"Error"
"Fail"
"Ongoing"
"Pending"
"Success"
"Unknown"
) ;
sh:message "Value is not member of the vocabulary ActionStatusTypeVocab." ;
sh:path action:actionStatus ;
sh:severity sh:Info ;
.

action:Action-disjointWith-Event-shape
a sh:NodeShape ;
sh:message "action:Action and core:Event are disjoint classes."@en ;
Expand Down Expand Up @@ -234,6 +222,7 @@ action:ActionFrequencyFacet
rdfs:label "ActionFrequencyFacet"@en ;
rdfs:comment "An action frequency facet is a grouping of characteristics unique to the frequency of occurrence for an action."@en ;
sh:property
action:ActionFrequencyFacet-trend-in-shape ,
[
sh:datatype xsd:decimal ;
sh:maxCount "1"^^xsd:integer ;
Expand All @@ -256,45 +245,32 @@ action:ActionFrequencyFacet
sh:path action:units ;
] ,
[
sh:datatype vocabulary:TrendVocab ;
sh:message "Value is outside the default vocabulary TrendVocab." ;
sh:datatype xsd:string ;
sh:message "As of UCO 1.4.0, the datatype to use for action:trend should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
sh:path action:trend ;
sh:severity sh:Info ;
sh:severity sh:Warning ;
] ,
[
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocabulary:TrendVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path action:trend ;
] ,
[
sh:message "Value is not member of the vocabulary TrendVocab." ;
sh:or (
[
sh:datatype vocabulary:TrendVocab ;
sh:in (
"Decreasing"^^vocabulary:TrendVocab
"Increasing"^^vocabulary:TrendVocab
) ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path action:trend ;
]
;
sh:targetClass action:ActionFrequencyFacet ;
.

action:ActionFrequencyFacet-trend-in-shape
a sh:PropertyShape ;
sh:in (
"Decreasing"
"Increasing"
) ;
sh:message "Value is not member of the vocabulary TrendVocab." ;
sh:path action:trend ;
sh:severity sh:Info ;
.

action:ActionLifecycle
a
owl:Class ,
Expand Down
28 changes: 14 additions & 14 deletions ontology/uco/core/core.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,9 @@ core:ObjectStatusVocab
owl:equivalentClass [
a rdfs:Datatype ;
owl:oneOf (
"Draft"^^core:ObjectStatusVocab
"Final"^^core:ObjectStatusVocab
"Deprecated"^^core:ObjectStatusVocab
"Draft"
"Final"
"Deprecated"
) ;
] ;
.
Expand Down Expand Up @@ -443,6 +443,17 @@ core:UcoObject
sh:nodeKind sh:Literal ;
sh:path core:modifiedTime ;
] ,
[
sh:datatype xsd:string ;
sh:in (
"Draft"
"Final"
"Deprecated"
) ;
sh:maxCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path core:objectStatus ;
] ,
[
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
Expand All @@ -464,17 +475,6 @@ core:UcoObject
sh:datatype xsd:string ;
sh:nodeKind sh:Literal ;
sh:path core:tag ;
] ,
[
sh:datatype core:ObjectStatusVocab ;
sh:in (
"Draft"^^core:ObjectStatusVocab
"Final"^^core:ObjectStatusVocab
"Deprecated"^^core:ObjectStatusVocab
) ;
sh:maxCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path core:objectStatus ;
]
;
sh:targetClass core:UcoObject ;
Expand Down
Loading
Loading