owl class module created

dice-group · Apr 9, 2024 · b07f21f · b07f21f
1 parent db48a17
commit b07f21f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/owlapy/owl_class_expression.py → owlapy/data_ranges/__init__.py b/owlapy/owl_class_expression.py → owlapy/data_ranges/__init__.py
@@ -1,11 +1,12 @@
 from abc import abstractmethod, ABCMeta
-from .owlobject import OWLObject, OWLEntity
-from .meta_classes import HasOperands
+from ..owlobject import OWLObject, OWLEntity
+from ..meta_classes import HasOperands
 from typing import Final, Iterable, Sequence
-from .ranges import OWLPropertyRange, OWLDataRange
-from .owl_literal import OWLLiteral
+from ..ranges import OWLPropertyRange, OWLDataRange
+from ..owl_literal import OWLLiteral
 from typing import Final, Sequence, Union, Iterable
-from .iri import IRI
+from ..iri import IRI
+
 class OWLDataComplementOf(OWLDataRange):
     """Represents DataComplementOf in the OWL 2 Specification."""
     type_index: Final = 4002

diff --git a/owlapy/model/__init__.py b/owlapy/model/__init__.py
@@ -13,7 +13,7 @@
     OWLObjectUnionOf, OWLObjectComplementOf
 from owlapy.class_expression import OWLThing, OWLNothing, OWLClass
 
-from owlapy.owl_class_expression import OWLPropertyRange, OWLDataRange
+from owlapy.data_ranges import OWLPropertyRange, OWLDataRange
 
 from owlapy.owl_property import OWLObjectPropertyExpression, OWLProperty, OWLPropertyExpression, \
     OWLDataPropertyExpression, OWLDataProperty, OWLObjectProperty

diff --git a/owlapy/parser.py b/owlapy/parser.py
@@ -19,7 +19,7 @@
     OWLLiteral, OWLDataRange, OWLDataOneOf, OWLDatatype, OWLObjectCardinalityRestriction, \
     OWLDataCardinalityRestriction, OWLObjectAllValuesFrom, OWLDataAllValuesFrom, BooleanOWLDatatype
 
-from owlapy.owl_class_expression import OWLDataIntersectionOf, OWLDataUnionOf, OWLDataComplementOf
+from owlapy.data_ranges import OWLDataIntersectionOf, OWLDataUnionOf, OWLDataComplementOf
 from owlapy.owl_restriction import OWLObjectHasValue, OWLDatatypeRestriction, OWLFacetRestriction, OWLObjectOneOf
 
 

diff --git a/owlapy/render.py b/owlapy/render.py
@@ -19,7 +19,8 @@
     OWLDataHasValue, OWLDataOneOf, OWLDataMaxCardinality, \
     OWLDataMinCardinality, OWLDataExactCardinality)
 from owlapy.vocab import OWLFacet
-from .owl_class_expression import OWLNaryDataRange, OWLDataComplementOf, OWLDataUnionOf, OWLDataIntersectionOf
+
+from .data_ranges import OWLNaryDataRange, OWLDataComplementOf, OWLDataUnionOf, OWLDataIntersectionOf
 from .owl_restriction import OWLObjectHasValue, OWLFacetRestriction, OWLDatatypeRestriction, OWLObjectOneOf
 
 _DL_SYNTAX = types.SimpleNamespace(

diff --git a/owlapy/util.py b/owlapy/util.py
@@ -11,7 +11,7 @@
     OWLDatatype,OWLDataOneOf, OWLLiteral, OWLObjectIntersectionOf, \
     OWLDataCardinalityRestriction, OWLNaryBooleanClassExpression, OWLObjectUnionOf, \
     OWLDataRange, OWLObject
-from .owl_class_expression import OWLDataComplementOf, OWLDataUnionOf, OWLDataIntersectionOf, OWLNaryDataRange
+from .data_ranges import OWLDataComplementOf, OWLDataUnionOf, OWLDataIntersectionOf, OWLNaryDataRange
 from .owl_restriction import OWLObjectHasValue, OWLDatatypeRestriction, OWLFacetRestriction, OWLObjectOneOf
 
 _HasIRI = TypeVar('_HasIRI', bound=HasIRI)  #:

diff --git a/tests/test_owlapy_nnf.py b/tests/test_owlapy_nnf.py
@@ -32,7 +32,7 @@
 from owlapy.model.providers import OWLDatatypeMinMaxExclusiveRestriction
 from owlapy.util import NNF
 
-from owlapy.owl_class_expression import OWLDataComplementOf, OWLDataIntersectionOf, OWLDataUnionOf
+from owlapy.data_ranges import OWLDataComplementOf, OWLDataIntersectionOf, OWLDataUnionOf
 from owlapy.owl_restriction import OWLObjectHasValue, OWLObjectOneOf
 
 def iri(suffix):

diff --git a/tests/test_owlapy_parser.py b/tests/test_owlapy_parser.py
@@ -10,7 +10,7 @@
     OWLObjectHasSelf, OWLObjectIntersectionOf, OWLObjectMaxCardinality, OWLObjectProperty, OWLDataExactCardinality, OWLDataMaxCardinality, \
     OWLDataMinCardinality, OWLDataHasValue, OWLThing, OWLNothing
 
-from owlapy.owl_class_expression import OWLDataIntersectionOf, OWLDataComplementOf, OWLDataUnionOf
+from owlapy.data_ranges import OWLDataIntersectionOf, OWLDataComplementOf, OWLDataUnionOf
 from owlapy.model.providers import OWLDatatypeMinExclusiveRestriction,\
     OWLDatatypeMinMaxExclusiveRestriction, OWLDatatypeMaxExclusiveRestriction
 from owlapy.owl_restriction import OWLDataSomeValuesFrom, OWLDatatypeRestriction, OWLFacetRestriction, OWLObjectSomeValuesFrom, OWLObjectMinCardinality, OWLObjectHasValue,OWLObjectOneOf

diff --git a/tests/test_owlapy_render.py b/tests/test_owlapy_render.py
@@ -6,7 +6,7 @@
     OWLDataOneOf, OWLDataSomeValuesFrom, OWLLiteral, BooleanOWLDatatype, \
     OWLDataMaxCardinality
 
-from owlapy.owl_class_expression import OWLDataComplementOf, OWLDataIntersectionOf, OWLDataUnionOf
+from owlapy.data_ranges import OWLDataComplementOf, OWLDataIntersectionOf, OWLDataUnionOf
 from owlapy.model.providers import OWLDatatypeMinMaxInclusiveRestriction
 from owlapy.render import DLSyntaxObjectRenderer, ManchesterOWLSyntaxOWLObjectRenderer
 from owlapy.owl_restriction import OWLObjectHasValue, OWLObjectOneOf