rustdl 0.3.26__tar.gz → 0.3.27__tar.gz

{rustdl-0.3.26 → rustdl-0.3.27}/Cargo.lock

@@ -1018,7 +1018,7 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "owl-dl-bench"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "anyhow",
  "clap",
@@ -1038,7 +1038,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-cb"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "hashbrown 0.15.5",
  "owl-dl-core",
@@ -1046,7 +1046,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-cli"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "anyhow",
  "clap",
@@ -1059,7 +1059,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-core"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "bitvec",
  "bumpalo",
@@ -1073,7 +1073,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-datatypes"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "owl-dl-core",
  "proptest",
@@ -1083,7 +1083,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-py"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "horned-owl",
  "owl-dl-core",
@@ -1094,7 +1094,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-reasoner"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "anyhow",
  "dashmap",
@@ -1112,7 +1112,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-saturation"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "dashmap",
  "fixedbitset",
@@ -1128,7 +1128,7 @@ dependencies = [
 
 [[package]]
 name = "owl-dl-tableau"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "bitvec",
  "bumpalo",
@@ -2554,7 +2554,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "0.3.26"
+version = "0.3.27"
 dependencies = [
  "anyhow",
  "clap",

{rustdl-0.3.26 → rustdl-0.3.27}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/owl-dl-core", "crates/owl-dl-saturation", "crates/owl-dl-tableau", "crates/owl-dl-datatypes", "crates/owl-dl-reasoner", "crates/owl-dl-py"]
 
 [workspace.package]
-version = "0.3.26"
+version = "0.3.27"
 edition = "2024"
 rust-version = "1.88"
 license = "Apache-2.0 OR MIT"

{rustdl-0.3.26 → rustdl-0.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustdl
-Version: 0.3.26
+Version: 0.3.27
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License

{rustdl-0.3.26 → rustdl-0.3.27}/crates/owl-dl-core/src/convert.rs

@@ -20,7 +20,7 @@ use crate::data_axioms::{
     RangeBucket, StrSet, exact_string_literal, parse_data_intersection_dkey, parse_date,
     parse_datetime, parse_decimal,
 };
-use crate::ir::{ClassId, ConceptId, IndividualId, Role};
+use crate::ir::{ClassId, ConceptExpr, ConceptId, IndividualId, Role};
 use crate::ontology::{Axiom, InternalOntology, SubRolePath};
 
 /// IRI namespace for synthetic *data-key* (`DKey`) classes. These are
@@ -2407,13 +2407,82 @@ fn seed_dkey_subsumptions(out: &mut InternalOntology) {
     // would spuriously make a class ⊥ = FP — cannot arise from overlapping
     // ranges. Same datatype bucketing: int / float / double / decimal / date /
     // dateTime / string never cross-seed.
-    seed_disjoint_bucket(out, &int_dkeys, |a, b| a.disjoint(*b));
-    seed_disjoint_bucket(out, &float_dkeys, |a, b| a.disjoint(*b));
-    seed_disjoint_bucket(out, &double_dkeys, |a, b| a.disjoint(*b));
-    seed_disjoint_bucket(out, &dec_dkeys, OrdRange::disjoint);
-    seed_disjoint_bucket(out, &date_dkeys, OrdRange::disjoint);
-    seed_disjoint_bucket(out, &dt_dkeys, OrdRange::disjoint);
-    seed_disjoint_bucket(out, &str_dkeys, StrSet::disjoint);
+    //
+    // GATE (2026-07-20): the disjointness is CONSUMED ONLY by a `∀p.DKey`
+    // (`ObjectAllValuesFrom` over a DKey filler) — that is the sole construct
+    // that puts a *second* DKey on the same role at a node to clash against an
+    // `∃p.DKey`. Without any such `∀p.DKey` in the ontology the O(k²) pairwise
+    // seeding is pure dead weight — and k is NOT small when DKeys come from
+    // ABox `DataPropertyAssertion`s (ore_ont_10425: 5261 distinct values →
+    // ~14M disjoint axioms → front-end conversion DNF). So skip the seeding
+    // when no `∀p.DKey` occurs. **Sound (FP-safe) by construction**: dropping
+    // `DisjointClasses` axioms is entailment-MONOTONE — it can only fail to
+    // derive an unsatisfiability (a tolerated MISS), never introduce a false
+    // subsumption. (A functional-data-property same-value inconsistency is
+    // still caught by the `abox_check` P5 / D4 data-cardinality pre-checks.)
+    let dkey_cids: std::collections::HashSet<ClassId> = int_dkeys
+        .iter()
+        .map(|(c, _)| *c)
+        .chain(float_dkeys.iter().map(|(c, _)| *c))
+        .chain(double_dkeys.iter().map(|(c, _)| *c))
+        .chain(dec_dkeys.iter().map(|(c, _)| *c))
+        .chain(date_dkeys.iter().map(|(c, _)| *c))
+        .chain(dt_dkeys.iter().map(|(c, _)| *c))
+        .chain(str_dkeys.iter().map(|(c, _)| *c))
+        .collect();
+    if ontology_has_forall_over_dkey(out, &dkey_cids) {
+        seed_disjoint_bucket(out, &int_dkeys, |a, b| a.disjoint(*b));
+        seed_disjoint_bucket(out, &float_dkeys, |a, b| a.disjoint(*b));
+        seed_disjoint_bucket(out, &double_dkeys, |a, b| a.disjoint(*b));
+        seed_disjoint_bucket(out, &dec_dkeys, OrdRange::disjoint);
+        seed_disjoint_bucket(out, &date_dkeys, OrdRange::disjoint);
+        seed_disjoint_bucket(out, &dt_dkeys, OrdRange::disjoint);
+        seed_disjoint_bucket(out, &str_dkeys, StrSet::disjoint);
+    }
+}
+
+/// True iff some axiom's class expression contains `∀R.f` (`ConceptExpr::All`)
+/// whose filler `f` is a `DKey` class (`cid ∈ dkeys`). This is the ONLY consumer
+/// of the D11b DKey-disjointness seeding (the `∃p.DKey(v) ⊓ ∀p.DKey(r)` range-
+/// membership clash), so when it is absent the O(k²) seeding is skippable — see
+/// [`seed_dkey_subsumptions`]. Short-circuits on the first hit.
+fn ontology_has_forall_over_dkey(
+    out: &InternalOntology,
+    dkeys: &std::collections::HashSet<ClassId>,
+) -> bool {
+    fn walk(
+        cid: ConceptId,
+        pool: &ConceptPool,
+        dkeys: &std::collections::HashSet<ClassId>,
+    ) -> bool {
+        match pool.get(cid) {
+            ConceptExpr::All(_, f) => {
+                matches!(pool.get(*f), ConceptExpr::Atomic(c) if dkeys.contains(c))
+                    || walk(*f, pool, dkeys)
+            }
+            ConceptExpr::Not(x)
+            | ConceptExpr::Some(_, x)
+            | ConceptExpr::Min(_, _, x)
+            | ConceptExpr::Max(_, _, x) => walk(*x, pool, dkeys),
+            ConceptExpr::And(ops) | ConceptExpr::Or(ops) => {
+                ops.iter().any(|o| walk(*o, pool, dkeys))
+            }
+            _ => false,
+        }
+    }
+    if dkeys.is_empty() {
+        return false;
+    }
+    let pool = &out.concepts;
+    out.axioms.iter().any(|ax| match ax {
+        Axiom::SubClassOf { sub, sup } => walk(*sub, pool, dkeys) || walk(*sup, pool, dkeys),
+        Axiom::EquivalentClasses(v) | Axiom::DisjointClasses(v) => {
+            v.iter().any(|c| walk(*c, pool, dkeys))
+        }
+        Axiom::DisjointUnion { members, .. } => members.iter().any(|c| walk(*c, pool, dkeys)),
+        Axiom::ClassAssertion { class, .. } => walk(*class, pool, dkeys),
+        _ => false,
+    })
 }
 
 /// Emit `DisjointClasses([DKey(r_i), DKey(r_j)])` for every UNORDERED pair

{rustdl-0.3.26 → rustdl-0.3.27}/crates/owl-dl-core/src/told.rs

@@ -22,6 +22,8 @@
 
 use std::collections::VecDeque;
 
+use std::collections::HashSet;
+
 use smallvec::SmallVec;
 
 use crate::ConceptPool;
@@ -106,7 +108,14 @@ impl ToldTables {
 pub fn build_told_tables(ontology: &InternalOntology) -> ToldTables {
     let n = ontology.vocabulary.num_classes();
     let mut direct_super: Vec<SmallVec<[ClassId; 4]>> = vec![SmallVec::new(); n];
-    let mut disjoint: Vec<SmallVec<[ClassId; 4]>> = vec![SmallVec::new(); n];
+    // Disjoint sets use a per-class `HashSet` (not `SmallVec`) so membership
+    // dedup during build is O(1), not O(k) linear-scan. A single large
+    // `DisjointClasses`/DKey-disjointness axiom produces O(k²) pairs; with the
+    // old `SmallVec::contains` that was O(k³) and stalled front-end conversion
+    // (ore_ont_10425: 5261 distinct data values → ~14M disjoint pairs → >150 s
+    // DNF). Output below is still a sorted `Box<[ClassId]>`, so the told table
+    // is byte-identical to the previous representation.
+    let mut disjoint: Vec<HashSet<ClassId>> = vec![HashSet::new(); n];
 
     let pool = &ontology.concepts;
 
@@ -234,14 +243,12 @@ fn add_edge(direct_super: &mut [SmallVec<[ClassId; 4]>], sub: ClassId, sup: Clas
     }
 }
 
-fn add_disjoint_pair(disjoint: &mut [SmallVec<[ClassId; 4]>], a: ClassId, b: ClassId) {
+fn add_disjoint_pair(disjoint: &mut [HashSet<ClassId>], a: ClassId, b: ClassId) {
     let ai = a.index() as usize;
     let bi = b.index() as usize;
-    if !disjoint[ai].contains(&b) {
-        disjoint[ai].push(b);
-    }
-    if a != b && !disjoint[bi].contains(&a) {
-        disjoint[bi].push(a);
+    disjoint[ai].insert(b);
+    if a != b {
+        disjoint[bi].insert(a);
     }
 }
 

{rustdl-0.3.26 → rustdl-0.3.27}/crates/owl-dl-py/src/explain.rs

@@ -30,14 +30,25 @@ pub(crate) fn render_manchester(path: &str) -> PyResult<Vec<String>> {
 }
 
 fn is_logical_axiom(c: &Component<RcStr>) -> bool {
-    use Component::*;
+    use Component::{
+        AnnotationAssertion, DeclareAnnotationProperty, DeclareClass, DeclareDataProperty,
+        DeclareDatatype, DeclareNamedIndividual, DeclareObjectProperty, DocIRI, Import,
+        OntologyAnnotation, OntologyID,
+    };
     // Exclude declarations, imports, and ontology-level metadata; keep the
     // class/property/individual axioms that carry entailment meaning.
     !matches!(
         c,
-        OntologyID(_) | DocIRI(_) | Import(_) | OntologyAnnotation(_)
-            | DeclareClass(_) | DeclareObjectProperty(_) | DeclareAnnotationProperty(_)
-            | DeclareDataProperty(_) | DeclareNamedIndividual(_) | DeclareDatatype(_)
+        OntologyID(_)
+            | DocIRI(_)
+            | Import(_)
+            | OntologyAnnotation(_)
+            | DeclareClass(_)
+            | DeclareObjectProperty(_)
+            | DeclareAnnotationProperty(_)
+            | DeclareDataProperty(_)
+            | DeclareNamedIndividual(_)
+            | DeclareDatatype(_)
             | AnnotationAssertion(_)
     )
 }
@@ -114,7 +125,7 @@ mod tests {
     use super::*;
 
     /// A⊑B, B⊑C written to a temp `.ofn` fixture; `render_manchester` should
-    /// return one Manchester string per SubClassOf axiom, each mentioning
+    /// return one Manchester string per `SubClassOf` axiom, each mentioning
     /// its sub/super class, and skip the two `Declaration(Class(...))`
     /// components as non-logical noise.
     #[test]