From 97dca5c8856f4cd366f1e9bb031917410b5aadd7 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 1 Jul 2024 15:28:40 -0400 Subject: [PATCH 1/4] Use CDO external-ontology shapes to check usage in instance data No effects were observed on Make-managed files. References: * https://github.com/casework/CASE-Examples/pull/146 Signed-off-by: Alex Nelson --- .gitmodules | 4 ++ Makefile | 5 +++ dependencies/CDO-Shapes-Time | 1 + .../existence_intervals/postvisit.mk | 41 +++++++++++++++++++ .../illustrations/src/illustration-nosrc.mk | 11 +++++ 5 files changed, 62 insertions(+) create mode 160000 dependencies/CDO-Shapes-Time create mode 100644 examples/illustrations/existence_intervals/postvisit.mk diff --git a/.gitmodules b/.gitmodules index 6922aea9..b9ab5108 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,7 @@ path = dependencies/CASE-unstable-2.0.0 url = https://github.com/casework/CASE-Archive.git branch = unstable-2.0.0 +[submodule "dependencies/CDO-Shapes-Time"] + path = dependencies/CDO-Shapes-Time + url = https://github.com/Cyber-Domain-Ontology/CDO-Shapes-Time.git + branch = main diff --git a/Makefile b/Makefile index 23738d53..3aad1727 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,11 @@ all: \ $(MAKE) \ --directory dependencies/CASE-unstable-2.0.0 \ .git_submodule_init.done.log + # CDO-Shapes-Time + test -r dependencies/CDO-Shapes-Time/README.md \ + || git submodule update --init dependencies/CDO-Shapes-Time + test -r dependencies/CDO-Shapes-Time/README.md \ + || (echo "ERROR:Makefile:CDO-Shapes-Time submodule README.md file not found, even though CDO-Shapes-Time submodule initialized." >&2 ; exit 2) # Retrieve rdf-toolkit.jar. $(MAKE) \ --directory dependencies/CASE-develop \ diff --git a/dependencies/CDO-Shapes-Time b/dependencies/CDO-Shapes-Time new file mode 160000 index 00000000..e845f23d --- /dev/null +++ b/dependencies/CDO-Shapes-Time @@ -0,0 +1 @@ +Subproject commit e845f23d370d8125ed0efe1cf34c5a546c3df083 diff --git a/examples/illustrations/existence_intervals/postvisit.mk b/examples/illustrations/existence_intervals/postvisit.mk new file mode 100644 index 00000000..80299de3 --- /dev/null +++ b/examples/illustrations/existence_intervals/postvisit.mk @@ -0,0 +1,41 @@ +#!/usr/bin/make -f + +# Portions of this file contributed by NIST are governed by the +# following statement: +# +# This software was developed at the National Institute of Standards +# and Technology by employees of the Federal Government in the course +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. +# +# We would appreciate acknowledgement if the software is used. + +SHELL := /bin/bash + +top_srcdir := $(shell cd ../../.. ; pwd) + +time_ttl := $(top_srcdir)/dependencies/CDO-Shapes-Time/dependencies/time.ttl +sh_time_ttl := $(top_srcdir)/dependencies/CDO-Shapes-Time/shapes/sh-time.ttl + +all: + +.cdo-shapes.done.log: \ + $(sh_time_ttl) \ + $(time_ttl) \ + $(top_srcdir)/.venv.done.log \ + existence_intervals.json + source $(top_srcdir)/venv/bin/activate \ + && case_validate \ + --ontology-graph $(sh_time_ttl) \ + --ontology-graph $(time_ttl) \ + existence_intervals.json + touch $@ + +check: \ + .cdo-shapes.done.log + +clean: diff --git a/examples/illustrations/src/illustration-nosrc.mk b/examples/illustrations/src/illustration-nosrc.mk index bc4d63ff..52f52ed5 100644 --- a/examples/illustrations/src/illustration-nosrc.mk +++ b/examples/illustrations/src/illustration-nosrc.mk @@ -85,6 +85,9 @@ all: \ test ! -r figures/Makefile \ || $(MAKE) \ --directory figures + test ! -r postvisit.mk \ + || $(MAKE) \ + --file postvisit.mk .PHONY: \ check-pytest @@ -335,6 +338,10 @@ check: \ $(example_name)_validation-develop-2.0.0.ttl \ $(example_name)_validation-unstable.ttl \ $(example_name)_validation-unstable-2.0.0.ttl + test ! -r postvisit.mk \ + || $(MAKE) \ + --file postvisit.mk \ + check # Run pytest tests only if any are written. # (Pytest exits in an error state if called with no tests found.) @@ -348,6 +355,10 @@ check-pytest: \ ) clean: + @test ! -r postvisit.mk \ + || $(MAKE) \ + --file postvisit.mk \ + clean @rm -f \ .drafting.ttl.*.log \ figures/*.dot \ From c4fff4b3d74813717799d8c8d326fbbca63e8afd Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 11 Jul 2024 09:24:16 -0400 Subject: [PATCH 2/4] Use CDO gUFO shapes to check usage in instance data No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- .gitmodules | 4 ++++ Makefile | 5 +++++ dependencies/CDO-Shapes-gufo | 1 + examples/illustrations/existence_intervals/postvisit.mk | 7 +++++++ 4 files changed, 17 insertions(+) create mode 160000 dependencies/CDO-Shapes-gufo diff --git a/.gitmodules b/.gitmodules index b9ab5108..938e1f30 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,3 +18,7 @@ path = dependencies/CDO-Shapes-Time url = https://github.com/Cyber-Domain-Ontology/CDO-Shapes-Time.git branch = main +[submodule "dependencies/CDO-Shapes-gufo"] + path = dependencies/CDO-Shapes-gufo + url = https://github.com/Cyber-Domain-Ontology/CDO-Shapes-gufo.git + branch = main diff --git a/Makefile b/Makefile index 3aad1727..8469686c 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,11 @@ all: \ || git submodule update --init dependencies/CDO-Shapes-Time test -r dependencies/CDO-Shapes-Time/README.md \ || (echo "ERROR:Makefile:CDO-Shapes-Time submodule README.md file not found, even though CDO-Shapes-Time submodule initialized." >&2 ; exit 2) + # CDO-Shapes-gufo + test -r dependencies/CDO-Shapes-gufo/README.md \ + || git submodule update --init dependencies/CDO-Shapes-gufo + test -r dependencies/CDO-Shapes-gufo/README.md \ + || (echo "ERROR:Makefile:CDO-Shapes-gufo submodule README.md file not found, even though CDO-Shapes-gufo submodule initialized." >&2 ; exit 2) # Retrieve rdf-toolkit.jar. $(MAKE) \ --directory dependencies/CASE-develop \ diff --git a/dependencies/CDO-Shapes-gufo b/dependencies/CDO-Shapes-gufo new file mode 160000 index 00000000..aebe0182 --- /dev/null +++ b/dependencies/CDO-Shapes-gufo @@ -0,0 +1 @@ +Subproject commit aebe0182fc7b75b5ef148f5b12cfe82192cd4336 diff --git a/examples/illustrations/existence_intervals/postvisit.mk b/examples/illustrations/existence_intervals/postvisit.mk index 80299de3..4e3bcb61 100644 --- a/examples/illustrations/existence_intervals/postvisit.mk +++ b/examples/illustrations/existence_intervals/postvisit.mk @@ -18,18 +18,25 @@ SHELL := /bin/bash top_srcdir := $(shell cd ../../.. ; pwd) +gufo_ttl := $(top_srcdir)/dependencies/CDO-Shapes-gufo/dependencies/gufo.ttl +sh_gufo_ttl := $(top_srcdir)/dependencies/CDO-Shapes-gufo/shapes/sh-gufo.ttl + time_ttl := $(top_srcdir)/dependencies/CDO-Shapes-Time/dependencies/time.ttl sh_time_ttl := $(top_srcdir)/dependencies/CDO-Shapes-Time/shapes/sh-time.ttl all: .cdo-shapes.done.log: \ + $(gufo_ttl) \ + $(sh_gufo_ttl) \ $(sh_time_ttl) \ $(time_ttl) \ $(top_srcdir)/.venv.done.log \ existence_intervals.json source $(top_srcdir)/venv/bin/activate \ && case_validate \ + --ontology-graph $(gufo_ttl) \ + --ontology-graph $(sh_gufo_ttl) \ --ontology-graph $(sh_time_ttl) \ --ontology-graph $(time_ttl) \ existence_intervals.json From ecaad1eb8f2eda85b0d9345afabf56c2d605543a Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 22 Jul 2024 16:07:38 -0400 Subject: [PATCH 3/4] Use CDO BFO shapes to check usage in instance data No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- .gitmodules | 4 ++++ Makefile | 5 +++++ dependencies/CDO-Shapes-BFO | 1 + examples/illustrations/existence_intervals/postvisit.mk | 7 +++++++ 4 files changed, 17 insertions(+) create mode 160000 dependencies/CDO-Shapes-BFO diff --git a/.gitmodules b/.gitmodules index 938e1f30..e1b8fe48 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,6 +14,10 @@ path = dependencies/CASE-unstable-2.0.0 url = https://github.com/casework/CASE-Archive.git branch = unstable-2.0.0 +[submodule "dependencies/CDO-Shapes-BFO"] + path = dependencies/CDO-Shapes-BFO + url = https://github.com/Cyber-Domain-Ontology/CDO-Shapes-BFO.git + branch = main [submodule "dependencies/CDO-Shapes-Time"] path = dependencies/CDO-Shapes-Time url = https://github.com/Cyber-Domain-Ontology/CDO-Shapes-Time.git diff --git a/Makefile b/Makefile index 8469686c..e8d9d616 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,11 @@ all: \ $(MAKE) \ --directory dependencies/CASE-unstable-2.0.0 \ .git_submodule_init.done.log + # CDO-Shapes-BFO + test -r dependencies/CDO-Shapes-BFO/README.md \ + || git submodule update --init dependencies/CDO-Shapes-BFO + test -r dependencies/CDO-Shapes-BFO/README.md \ + || (echo "ERROR:Makefile:CDO-Shapes-BFO submodule README.md file not found, even though CDO-Shapes-BFO submodule initialized." >&2 ; exit 2) # CDO-Shapes-Time test -r dependencies/CDO-Shapes-Time/README.md \ || git submodule update --init dependencies/CDO-Shapes-Time diff --git a/dependencies/CDO-Shapes-BFO b/dependencies/CDO-Shapes-BFO new file mode 160000 index 00000000..1ce73867 --- /dev/null +++ b/dependencies/CDO-Shapes-BFO @@ -0,0 +1 @@ +Subproject commit 1ce73867dfcc132a1465a578d2a5d591c76f8462 diff --git a/examples/illustrations/existence_intervals/postvisit.mk b/examples/illustrations/existence_intervals/postvisit.mk index 4e3bcb61..0145b87e 100644 --- a/examples/illustrations/existence_intervals/postvisit.mk +++ b/examples/illustrations/existence_intervals/postvisit.mk @@ -18,6 +18,9 @@ SHELL := /bin/bash top_srcdir := $(shell cd ../../.. ; pwd) +bfo_ttl := $(top_srcdir)/dependencies/CDO-Shapes-BFO/dependencies/BFO.ttl +sh_bfo_ttl := $(top_srcdir)/dependencies/CDO-Shapes-BFO/shapes/sh-bfo.ttl + gufo_ttl := $(top_srcdir)/dependencies/CDO-Shapes-gufo/dependencies/gufo.ttl sh_gufo_ttl := $(top_srcdir)/dependencies/CDO-Shapes-gufo/shapes/sh-gufo.ttl @@ -27,7 +30,9 @@ sh_time_ttl := $(top_srcdir)/dependencies/CDO-Shapes-Time/shapes/sh-time.ttl all: .cdo-shapes.done.log: \ + $(bfo_ttl) \ $(gufo_ttl) \ + $(sh_bfo_ttl) \ $(sh_gufo_ttl) \ $(sh_time_ttl) \ $(time_ttl) \ @@ -35,7 +40,9 @@ all: existence_intervals.json source $(top_srcdir)/venv/bin/activate \ && case_validate \ + --ontology-graph $(bfo_ttl) \ --ontology-graph $(gufo_ttl) \ + --ontology-graph $(sh_bfo_ttl) \ --ontology-graph $(sh_gufo_ttl) \ --ontology-graph $(sh_time_ttl) \ --ontology-graph $(time_ttl) \ From 8e82419c223ad5ba1c2f527394a6e447f851ea9a Mon Sep 17 00:00:00 2001 From: Alex Nelsin Date: Tue, 2 Dec 2025 14:30:53 -0500 Subject: [PATCH 4/4] Bump shape pointers No effects were observed on Make-managed files. Signed-off-by: Alex Nelsin --- dependencies/CDO-Shapes-BFO | 2 +- dependencies/CDO-Shapes-Time | 2 +- dependencies/CDO-Shapes-gufo | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/CDO-Shapes-BFO b/dependencies/CDO-Shapes-BFO index 1ce73867..b25016e8 160000 --- a/dependencies/CDO-Shapes-BFO +++ b/dependencies/CDO-Shapes-BFO @@ -1 +1 @@ -Subproject commit 1ce73867dfcc132a1465a578d2a5d591c76f8462 +Subproject commit b25016e8587375625c521ce3e080fcde074c1d09 diff --git a/dependencies/CDO-Shapes-Time b/dependencies/CDO-Shapes-Time index e845f23d..6a5a0b62 160000 --- a/dependencies/CDO-Shapes-Time +++ b/dependencies/CDO-Shapes-Time @@ -1 +1 @@ -Subproject commit e845f23d370d8125ed0efe1cf34c5a546c3df083 +Subproject commit 6a5a0b624922cacf941b48b9d89959f1b9b6e4c3 diff --git a/dependencies/CDO-Shapes-gufo b/dependencies/CDO-Shapes-gufo index aebe0182..9a41df1b 160000 --- a/dependencies/CDO-Shapes-gufo +++ b/dependencies/CDO-Shapes-gufo @@ -1 +1 @@ -Subproject commit aebe0182fc7b75b5ef148f5b12cfe82192cd4336 +Subproject commit 9a41df1bad2e1ce935c1cc42721c9f696a4174eb