Skip to content

Added dataproperties to OWL2 signature #2168

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
b-gehrke merged 5 commits into from
Oct 7, 2025
+30 −26
Merged

Added dataproperties to OWL2 signature #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1eed7e3
Added dataproperties to OWL2 signature
b-gehrke Oct 6, 2025
bcadb85
Update runners to ubuntu 22.04
b-gehrke Oct 7, 2025
af21778
Bump actions/cache version
b-gehrke Oct 7, 2025
dcbfd02
Bump actions/upload-artifact and actions/download-artifact
b-gehrke Oct 7, 2025
6806fe1
Bump download-artifact action version
b-gehrke Oct 7, 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
50 changes: 25 additions & 25 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
job_1:
# Takes ~ 21 min | 35 s.
name: Build Stack
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
# If the job takes longer than 30 min, something is going wrong and we want
# GHA to kill the job to save build time. E.g. stack sometimes goes in an
# endless loop if compilation fails.
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
# copy cached yet.
- name: Fetch stack cache
id: stack_cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.STACK_ROOT }}
key: stack-${{ runner.os }}-${{ hashFiles('stack.yaml') }}
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
# Takes ~ 18 min | 45 s.
name: Build Hets Server
#if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: job_1
steps:
- name: Checkout
Expand All @@ -227,7 +227,7 @@ jobs:

- name: Fetch stack cache
if: startsWith(env.FAKE_URL, 'http') == false
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.STACK_ROOT }}
key: stack-${{ runner.os }}-${{ hashFiles('stack.yaml.orig') }}
Expand All @@ -245,7 +245,7 @@ jobs:
# ~ 496 MiB, 20 s
- name: Upload cached stack
if: env.DEBUG == 'true'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: stack0
path: ${{ runner.temp }}/stack0.tzst
Expand All @@ -254,7 +254,7 @@ jobs:
# ~ 9 MiB
- name: Upload Hets source dir
if: env.DEBUG == 'true'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: hets0
path: ${{ runner.temp }}/hets0.tzst
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
- name: Upload Binary
continue-on-error: true
#if: github.event_name == 'push'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: hets server binary
path: hets-server.xz
Expand All @@ -311,7 +311,7 @@ jobs:
# ~ 125 MiB , 15s
- name: Upload Hets build dir
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: hets-server
path: ${{ runner.temp }}/${{ env.HETS_ARC }}
Expand All @@ -326,7 +326,7 @@ jobs:
# ~ 496 MiB, 20 s
- name: Upload post build stack
if: env.DEBUG == 'true'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: stack1
path: ${{ runner.temp }}/stack1.tzst
Expand All @@ -337,7 +337,7 @@ jobs:
# Takes ~ 19 min | 45 s.
name: Build Hets Desktop
#if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: job_1
steps:
# The desktop version needs additional GUI packages usually not installed.
Expand All @@ -357,7 +357,7 @@ jobs:

- name: Fetch stack cache
if: startsWith(env.FAKE_URL, 'http') == false
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.STACK_ROOT }}
key: stack-${{ runner.os }}-${{ hashFiles('stack.yaml') }}
Expand Down Expand Up @@ -405,7 +405,7 @@ jobs:
- name: Upload Binary
continue-on-error: true
#if: github.event_name == 'push'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: hets desktop binary
path: hets.xz
Expand All @@ -414,7 +414,7 @@ jobs:
# ~ 17 s
- name: Upload Hets build dir
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: hets-desktop
path: ${{ runner.temp }}/${{ env.HETS_ARC }}
Expand All @@ -430,7 +430,7 @@ jobs:
# Takes about 12 min.
name: Test components
if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: job_2a
steps:
# ~ 30 s
Expand Down Expand Up @@ -459,7 +459,7 @@ jobs:
uses: actions/checkout@v2

- name: Download Hets build dir
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: hets-server
path: ${{ runner.temp }}
Expand All @@ -470,7 +470,7 @@ jobs:
sudo cp -p ksh93 /bin/ksh93

- name: Fetch stack cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.STACK_ROOT }}
key: stack-${{ runner.os }}-${{ hashFiles('stack.yaml.orig') }}
Expand All @@ -497,11 +497,11 @@ jobs:
# Takes ~ 2 min.
name: Test Hets-Lib
if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: job_2a
steps:
- name: Download Hets build dir
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: hets-server
path: ${{ runner.temp }}
Expand Down Expand Up @@ -535,11 +535,11 @@ jobs:
# Takes ~ 14 min.
name: Test PostgreSQL DB
if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: job_2a
steps:
- name: Download Hets build dir
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: hets-server
path: ${{ runner.temp }}
Expand Down Expand Up @@ -571,11 +571,11 @@ jobs:
# Takes ~ 5 min.
name: Test SQLite DB
if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: job_2a
steps:
- name: Download Hets build dir
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: hets-server
path: ${{ runner.temp }}
Expand Down Expand Up @@ -608,7 +608,7 @@ jobs:
job_4a:
# Takes ~ 20 min | 18 s.
name: Build docs
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: job_1
steps:
- name: Fake Build
Expand Down Expand Up @@ -639,7 +639,7 @@ jobs:
- name: Fetch stack cache
if: startsWith(env.FAKE_URL, 'http') == false
|| steps.download.outcome == 'failure'
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.STACK_ROOT }}
key: stack-${{ runner.os }}-${{ hashFiles('stack.yaml') }}
Expand Down Expand Up @@ -683,7 +683,7 @@ jobs:
if: startsWith(env.FAKE_URL, 'http')
&& steps.download.outcome == 'failure'
continue-on-error: true
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: docs
path: ${{ runner.temp }}/docs.tgz
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# runner forever (or until it gets kicked by a github cleanup job). See also
# https://github.com/actions/runner-images/issues/6002
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Dump GitHub context
env:
Expand Down
2 changes: 2 additions & 0 deletions OWL2/Sign.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ addSymbToSign sig ent =
return sig {objectProperties = Set.insert eIri $ objectProperties sig}
Entity _ NamedIndividual eIri ->
return sig {individuals = Set.insert eIri $ individuals sig}
Entity _ DataProperty eIri ->
return sig {dataProperties = Set.insert eIri $ dataProperties sig}
_ -> return sig

addSign :: Sign -> Sign -> Sign
Expand Down
2 changes: 2 additions & 0 deletions OWL2/StaticAnalysis.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,8 @@ corr2theo _aname flag ssig tsig l1 l2 eMap1 eMap2 rref = do
AS.EquivalentClasses [] (AS.Expression . AS.cutIRI <$> [e1', e2'])
(AS.ObjectProperty, AS.ObjectProperty) -> AS.ObjectPropertyAxiom $
AS.EquivalentObjectProperties [] (AS.ObjectProp . AS.cutIRI <$> [e1', e2'])
(AS.DataProperty, AS.DataProperty) -> AS.DataPropertyAxiom $
AS.EquivalentDataProperties [] (AS.cutIRI <$> [e1', e2'])
(AS.NamedIndividual, AS.NamedIndividual) -> AS.Assertion $
AS.SameIndividual [] (AS.cutIRI <$> [e1', e2'])
_ -> error $ "use subsumption only between"
Expand Down