Update O·L·O modelling

This commit introduces new `OrderedAggregation` and `Slot` terms in the
`ladys:` name·space upon which O·L·O is built. The `ladys:` versions of
these classes differ in that they do not require an `olo:length`.

diff --git a/data/classes/olo¦OrderedList b/data/classes/olo¦OrderedList
index febdc9dceaa4eb500ad9c54d0634b0772a5931f6..4b6d01a6ac88d472ec0121e2703e38e8e51a4d42 100644 (file)
--- a/data/classes/olo¦OrderedList
+++ b/data/classes/olo¦OrderedList
@@ -17,6 +17,16 @@ SPDX-License-Identifier: CC0-1.0
        <subClassOf>
                <resource name="OrderedAggregation"/>
        </subClassOf>
+       <subClassOf>
+               <Restriction>
+                       <onProperty>
+                               <resource name="hasSlot"/>
+                       </onProperty>
+                       <allValuesFrom>
+                               <resource name="olo:Slot"/>
+                       </allValuesFrom>
+               </Restriction>
+       </subClassOf>
        <subClassOf>
                <Restriction>
                        <onProperty>

diff --git a/data/classes/olo¦Slot b/data/classes/olo¦Slot
index b49cf97baca02ae2312a2e127c24805cbace3b07..9b1eca9763914e0f9a50ea0a5d7f087b26b2d4b7 100644 (file)
--- a/data/classes/olo¦Slot
+++ b/data/classes/olo¦Slot
@@ -14,18 +14,22 @@ SPDX-License-Identifier: CC0-1.0
                        The <ref target="olo:item">item</ref> of a Slot provides the thing being it proxies.
                </p>
                <p>
-                       When an <ref target="OrderedAggregation">Ordered Aggregation</ref> <ref target="hasSlot">has a slot</ref>, its index must be unique within that Ordered Aggregation.
-                       However, Slots are permitted to <ref target="ore:proxyIn">be proxies in</ref> other kinds of <ref target="ore:Aggregation">Aggregation</ref>, in which case index uniqueness is not required.
-               </p>
-               <p>
-                       When a Slot <ref target="olo:ordered_list">has an ordered list</ref>, its index should be less than or equal to the <ref target="olo:length">length</ref> of that <ref target="olo:OrderedList">Ordered List</ref>.
+                       The index of a Slot should be less than or equal to the <ref target="olo:length">length</ref> of its <ref target="olo:ordered_list">ordered list</ref>.
                </p>
        </comment>
        <isDefinedBy>
                <SpecificResource source="(OLO)" fragment="Slot"/>
        </isDefinedBy>
        <subClassOf>
-               <resource name="ore:Proxy"/>
+               <resource name="Slot"/>
+       </subClassOf>
+       <subClassOf>
+               <Restriction>
+                       <onProperty>
+                               <resource name="olo:ordered_list"/>
+                       </onProperty>
+                       <cardinality>1</cardinality>
+               </Restriction>
        </subClassOf>
        <subClassOf>
                <Restriction>
@@ -43,12 +47,4 @@ SPDX-License-Identifier: CC0-1.0
                        <cardinality>1</cardinality>
                </Restriction>
        </subClassOf>
-       <hasKey>
-               <ObjectProperty>
-                       <inverseOf>
-                               <resource name="hasSlot"/>
-                       </inverseOf>
-               </ObjectProperty>
-               <resource name="olo:index"/>
-       </hasKey>
 </Class>

diff --git a/data/classes/owl¦Nothing b/data/classes/owl¦Nothing
new file mode 100644 (file)
index 0000000..d7957ef
--- /dev/null
+++ b/data/classes/owl¦Nothing
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+SPDX-FileCopyrightText: 2025 Lady <https://www.ladys.computer/about/#lady>
+SPDX-License-Identifier: CC0-1.0
+-->
+<!DOCTYPE Class SYSTEM "../../DTD">
+<Class>
+       <label xml:lang="en">Nothing</label>
+       <comment xml:lang="en">
+               <p>
+                       No thing.
+               </p>
+       </comment>
+       <isDefinedBy>
+               <SpecificResource source="(OWL2)" fragment="a_Nothing"/>
+       </isDefinedBy>
+</Class>

diff --git a/data/classes/owl¦Thing b/data/classes/owl¦Thing
new file mode 100644 (file)
index 0000000..aef4566
--- /dev/null
+++ b/data/classes/owl¦Thing
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+SPDX-FileCopyrightText: 2025 Lady <https://www.ladys.computer/about/#lady>
+SPDX-License-Identifier: CC0-1.0
+-->
+<!DOCTYPE Class SYSTEM "../../DTD">
+<Class>
+       <label xml:lang="en">Thing</label>
+       <comment xml:lang="en">
+               <p>
+                       Any thing.
+               </p>
+       </comment>
+       <isDefinedBy>
+               <SpecificResource source="(OWL2)" fragment="a_Thing"/>
+       </isDefinedBy>
+       <hasKey>
+               <resource name="in"/>
+               <resource name="n"/>
+       </hasKey>
+</Class>

diff --git a/data/classes/¦OrderedAggregation b/data/classes/¦OrderedAggregation
index 7801433243cff0dd4c83eb3204a57dadb6b3dd97..a82ef3d1f77d366316b1fc11663e4181cd8c2322 100644 (file)
--- a/data/classes/¦OrderedAggregation
+++ b/data/classes/¦OrderedAggregation
@@ -8,10 +8,35 @@ SPDX-License-Identifier: CC0-1.0
        <label xml:lang="en">Ordered Aggregation</label>
        <comment xml:lang="en">
                <p>
-                       An <ref target="ore:Aggregation">Aggregation</ref> which may <ref target="hasSlot">have slots</ref> that are orderable by numeric <ref target="olo:index">index</ref>.
+                       An <ref target="ore:Aggregation">Aggregation</ref> which may <ref target="hasSlot">have slots</ref> that are orderable by positive integral <ref target="n">local notation</ref>.
                </p>
        </comment>
        <subClassOf>
                <resource name="ore:Aggregation"/>
        </subClassOf>
+       <subClassOf>
+               <Restriction>
+                       <onProperty>
+                               <resource name="hasSlot"/>
+                       </onProperty>
+                       <allValuesFrom>
+                               <Restriction>
+                                       <onProperty>
+                                               <resource name="n"/>
+                                       </onProperty>
+                                       <allValuesFrom>
+                                               <resource name="xsd:positiveInteger"/>
+                                       </allValuesFrom>
+                               </Restriction>
+                       </allValuesFrom>
+               </Restriction>
+       </subClassOf>
+       <disjointWith>
+               <Class>
+                       <intersectionOf>
+                               <resource name="Branch"/>
+                               <resource name="BNSComponent"/>
+                       </intersectionOf>
+               </Class>
+       </disjointWith>
 </Class>

diff --git a/data/classes/¦Slot b/data/classes/¦Slot
new file mode 100644 (file)
index 0000000..8668979
--- /dev/null
+++ b/data/classes/¦Slot
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+SPDX-FileCopyrightText: 2025 Lady <https://www.ladys.computer/about/#lady>
+SPDX-License-Identifier: CC0-1.0
+-->
+<!DOCTYPE Class SYSTEM "../../DTD">
+<Class status="testing">
+       <label xml:lang="en">Slot</label>
+       <comment xml:lang="en">
+               <p>
+                       A <ref target="ore:Proxy">Proxy</ref> which has a <ref target="n">local notation</ref>, unique within the <ref target="ore:Aggregation">Aggregation</ref> that it is <ref target="ore:proxyIn">proxy in</ref>.
+               </p>
+       </comment>
+       <subClassOf>
+               <resource name="ore:Proxy"/>
+       </subClassOf>
+       <subClassOf>
+               <Restriction>
+                       <onProperty>
+                               <ObjectProperty>
+                                       <inverseOf>
+                                               <resource name="hasSlot"/>
+                                       </inverseOf>
+                               </ObjectProperty>
+                       </onProperty>
+                       <cardinality>1</cardinality>
+               </Restriction>
+       </subClassOf>
+       <subClassOf>
+               <Restriction>
+                       <onProperty>
+                               <ObjectProperty>
+                                       <inverseOf>
+                                               <resource name="inSlot"/>
+                                       </inverseOf>
+                               </ObjectProperty>
+                       </onProperty>
+                       <cardinality>1</cardinality>
+               </Restriction>
+       </subClassOf>
+       <subClassOf>
+               <Restriction>
+                       <onProperty>
+                               <resource name="n"/>
+                       </onProperty>
+                       <cardinality>1</cardinality>
+               </Restriction>
+       </subClassOf>
+       <disjointWith>
+               <resource name="ore:Aggregation"/>
+       </disjointWith>
+</Class>

diff --git a/data/datatype_properties/¦n b/data/datatype_properties/¦n
index e120d9dd7a061bb3d3479388665809046b385b11..34ebf29ff077f236ae90fd2661cbc519e4adc4ee 100644 (file)
--- a/data/datatype_properties/¦n
+++ b/data/datatype_properties/¦n
@@ -4,11 +4,11 @@ SPDX-FileCopyrightText: 2025 Lady <https://www.ladys.computer/about/#lady>
 SPDX-License-Identifier: CC0-1.0
 -->
 <!DOCTYPE DatatypeProperty SYSTEM "../../DTD">
-<DatatypeProperty functional="yes" status="testing">
+<DatatypeProperty status="testing">
        <label xml:lang="en">local notation</label>
        <comment xml:lang="en">
                <p>
-                       An integer, string, or time·stamp which identifies and orders a thing within a given context.
+                       An integer, string, or time·stamp which identifies and orders a thing within its <ref target="in">local context</ref>.
                </p>
                <p>
                        String values can either be valid <resource name="xsd:NCName"/>¦s or else have the form of a <resource name="xsd:gYearMonth"/> or <resource name="xsd:date"/> with no time·zone component.
@@ -152,6 +152,14 @@ SPDX-License-Identifier: CC0-1.0
        <subPropertyOf>
                <resource name="dcterms:identifier"/>
        </subPropertyOf>
+       <domain>
+               <Restriction>
+                       <onProperty>
+                               <resource name="in"/>
+                       </onProperty>
+                       <cardinality>1</cardinality>
+               </Restriction>
+       </domain>
        <range>
                <Datatype>
                        <unionOf>

diff --git a/data/object_properties/olo¦item b/data/object_properties/olo¦item
index ab3c4d7ffe86e7e2b86f168c0b104ab99a9c75ca..3a162a5993000aa134759e58382ec846bcae6dd7 100644 (file)
--- a/data/object_properties/olo¦item
+++ b/data/object_properties/olo¦item
@@ -15,7 +15,11 @@ SPDX-License-Identifier: CC0-1.0
                <SpecificResource source="(OLO)" fragment="item"/>
        </isDefinedBy>
        <subPropertyOf>
-               <resource name="ore:proxyFor"/>
+               <ObjectProperty>
+                       <inverseOf>
+                               <resource name="inSlot"/>
+                       </inverseOf>
+               </ObjectProperty>
        </subPropertyOf>
        <domain>
                <resource name="olo:Slot"/>

diff --git a/data/object_properties/olo¦slot b/data/object_properties/olo¦slot
index 8aac11331b854de2f1ee96be61778fe91ce5440a..423d1ec14718df084d87f092e851dc703bcff96c 100644 (file)
--- a/data/object_properties/olo¦slot
+++ b/data/object_properties/olo¦slot
@@ -20,4 +20,7 @@ SPDX-License-Identifier: CC0-1.0
        <domain>
                <resource name="olo:OrderedList"/>
        </domain>
+       <range>
+               <resource name="olo:Slot"/>
+       </range>
 </ObjectProperty>

diff --git a/data/object_properties/ore¦proxyIn b/data/object_properties/ore¦proxyIn
index 29023d220443fa56d8a86698e90aff87e0b27f5b..feafc1f26852867ce429405e3ecc845baed94684 100644 (file)
--- a/data/object_properties/ore¦proxyIn
+++ b/data/object_properties/ore¦proxyIn
@@ -14,6 +14,9 @@ SPDX-License-Identifier: CC0-1.0
        <isDefinedBy>
                <SpecificResource source="(OAI-ORE)" fragment="ore-proxyIn"/>
        </isDefinedBy>
+       <subPropertyOf>
+               <resource name="in"/>
+       </subPropertyOf>
        <domain>
                <resource name="ore:Proxy"/>
        </domain>

diff --git a/data/object_properties/¦hasSlot b/data/object_properties/¦hasSlot
index fe77399f60d4d636c6d0c88a56d5a5dcaf44f539..0cf4f11e81104aafeb8c185ef59e7a0e7ce2c3e3 100644 (file)
--- a/data/object_properties/¦hasSlot
+++ b/data/object_properties/¦hasSlot
@@ -8,7 +8,7 @@ SPDX-License-Identifier: CC0-1.0
        <label xml:lang="en">has slot</label>
        <comment xml:lang="en">
                <p>
-                       A <ref target="olo:Slot">Slot</ref> in this <ref target="OrderedAggregation">Ordered Aggregation</ref>.
+                       A <ref target="Slot">Slot</ref> in this <ref target="ore:Aggregation">Aggregation</ref>.
                </p>
        </comment>
        <subPropertyOf>
@@ -19,9 +19,9 @@ SPDX-License-Identifier: CC0-1.0
                </ObjectProperty>
        </subPropertyOf>
        <domain>
-               <resource name="OrderedAggregation"/>
+               <resource name="ore:Aggregation"/>
        </domain>
        <range>
-               <resource name="olo:Slot"/>
+               <resource name="Slot"/>
        </range>
 </ObjectProperty>

diff --git a/data/object_properties/¦in b/data/object_properties/¦in
new file mode 100644 (file)
index 0000000..99e40f5
--- /dev/null
+++ b/data/object_properties/¦in
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+SPDX-FileCopyrightText: 2025 Lady <https://www.ladys.computer/about/#lady>
+SPDX-License-Identifier: CC0-1.0
+-->
+<!DOCTYPE ObjectProperty SYSTEM "../../DTD">
+<ObjectProperty functional="yes" irreflexive="yes" status="testing">
+       <label xml:lang="en">has local context</label>
+       <comment xml:lang="en">
+               <p>
+                       The local context for this thing, in terms of which its properties should be considered.
+               </p>
+               <p>
+                       If a thing does not have an inherent local context, local contexts (and associated properties) may be added thru the use of <ref target="Proxy">Proxies</ref>.
+               </p>
+       </comment>
+</ObjectProperty>

diff --git a/data/object_properties/¦inSlot b/data/object_properties/¦inSlot
new file mode 100644 (file)
index 0000000..1a5bcdb
--- /dev/null
+++ b/data/object_properties/¦inSlot
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+SPDX-FileCopyrightText: 2025 Lady <https://www.ladys.computer/about/#lady>
+SPDX-License-Identifier: CC0-1.0
+-->
+<!DOCTYPE ObjectProperty SYSTEM "../../DTD">
+<ObjectProperty inverseFunctional="yes" irreflexive="yes" status="testing">
+       <label xml:lang="en">in slot</label>
+       <comment xml:lang="en">
+               <p>
+                       A <ref target="Slot">Slot</ref> that is <ref target="ore:proxyFor">proxy for</ref> this thing.
+               </p>
+       </comment>
+       <subPropertyOf>
+               <ObjectProperty>
+                       <inverseOf>
+                               <resource name="ore:proxyFor"/>
+                       </inverseOf>
+               </ObjectProperty>
+       </subPropertyOf>
+       <range>
+               <resource name="Slot"/>
+       </range>
+</ObjectProperty>