fuzzy-dl-owl2 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

fuzzy_dl_owl2/fuzzydl/fuzzydl_to_owl2.py

@@ -5,6 +5,8 @@ import sys
 import typing
 from functools import partial
 
+from rdflib import RDF, XSD, Literal, Namespace, URIRef
+
 from fuzzy_dl_owl2.fuzzydl.assertion.assertion import Assertion
 from fuzzy_dl_owl2.fuzzydl.concept.all_some_concept import AllSomeConcept
 from fuzzy_dl_owl2.fuzzydl.concept.choquet_integral import ChoquetIntegral
@@ -125,7 +127,6 @@ from pyowl2.expressions.object_property import OWLObjectProperty
 from pyowl2.individual.named_individual import OWLNamedIndividual
 from pyowl2.literal.literal import OWLLiteral
 from pyowl2.ontology import OWLOntology
-from rdflib import RDF, XSD, Literal, Namespace, URIRef
 
 
 # @utils.timer_decorator
@@ -346,12 +347,14 @@ class FuzzydlToOwl2:
             return self.__get_class_weighted_min_max_sum(c)
         elif c_type in (
             ConceptType.OWA,
-            ConceptType.QUANTIFIED_OWA,
+            # ConceptType.QUANTIFIED_OWA,
             ConceptType.CHOQUET_INTEGRAL,
             ConceptType.SUGENO_INTEGRAL,
             ConceptType.QUASI_SUGENO_INTEGRAL,
         ):
             return self.__get_class_weighted(c)
+        elif c_type == ConceptType.QUANTIFIED_OWA:
+            return self.__get_class_q_owa(c)
         cls = OWLClass(self.iri(str(c)))
         self.ontology.add_axiom(OWLDeclaration(cls))
         return cls
@@ -392,14 +395,14 @@ class FuzzydlToOwl2:
         """Get the class for OWA, Quantified OWA, Choquet Integral, Sugeno Integral, or Quasi Sugeno Integral"""
         type_dict: dict[ConceptType, str] = {
             ConceptType.OWA: FuzzyOWL2Keyword.OWA.get_str_value(),
-            ConceptType.QUANTIFIED_OWA: FuzzyOWL2Keyword.Q_OWA.get_str_value(),
+            # ConceptType.QUANTIFIED_OWA: FuzzyOWL2Keyword.Q_OWA.get_str_value(),
             ConceptType.CHOQUET_INTEGRAL: FuzzyOWL2Keyword.CHOQUET.get_str_value(),
             ConceptType.SUGENO_INTEGRAL: FuzzyOWL2Keyword.SUGENO.get_str_value(),
             ConceptType.QUASI_SUGENO_INTEGRAL: FuzzyOWL2Keyword.QUASI_SUGENO.get_str_value(),
         }
         type_cast: dict[ConceptType, typing.Callable] = {
             ConceptType.OWA: partial(typing.cast, OwaConcept),
-            ConceptType.QUANTIFIED_OWA: partial(typing.cast, QowaConcept),
+            # ConceptType.QUANTIFIED_OWA: partial(typing.cast, QowaConcept),
             ConceptType.CHOQUET_INTEGRAL: partial(typing.cast, ChoquetIntegral),
             ConceptType.SUGENO_INTEGRAL: partial(typing.cast, SugenoIntegral),
             ConceptType.QUASI_SUGENO_INTEGRAL: partial(typing.cast, QsugenoIntegral),
@@ -423,6 +426,30 @@ class FuzzydlToOwl2:
         self.add_entity_annotation(annotation, c4)
         return c4
 
+    def __get_class_q_owa(self, c: Concept) -> OWLClassExpression:
+        """Get the class for OWA, Quantified OWA, Choquet Integral, Sugeno Integral, or Quasi Sugeno Integral"""
+        type_dict: dict[ConceptType, str] = {
+            ConceptType.QUANTIFIED_OWA: FuzzyOWL2Keyword.Q_OWA.get_str_value(),
+        }
+        type_cast: dict[ConceptType, typing.Callable] = {
+            ConceptType.QUANTIFIED_OWA: partial(typing.cast, QowaConcept),
+        }
+        if c.type not in type_dict:
+            return None
+        curr_concept: QowaConcept = type_cast[c.type](c)
+        c4: OWLClassExpression = self.get_new_atomic_class(str(c))
+        annotation: str = (
+            f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.CONCEPT.get_str_value()}">\n',
+            f'\t<{FuzzyOWL2Keyword.CONCEPT.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{type_dict[c.type]}" {FuzzyOWL2Keyword.QUANTIFIER.get_tag_name()}="{curr_concept.quantifier}">\n',
+            f"\t\t<{FuzzyOWL2Keyword.CONCEPT_NAMES.get_tag_name()}>\n",
+        )
+        for ci in curr_concept.concepts:
+            c5: OWLClassExpression = self.get_base(ci)
+            annotation += f"\t\t\t<{FuzzyOWL2Keyword.NAME.get_tag_name()}>{c5}</{FuzzyOWL2Keyword.NAME.get_tag_name()}>\n"
+        annotation += f"\t\t</{FuzzyOWL2Keyword.CONCEPT_NAMES.get_tag_name()}>\n\t</{FuzzyOWL2Keyword.CONCEPT.get_tag_name()}>\n</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+        self.add_entity_annotation(annotation, c4)
+        return c4
+
     def get_new_atomic_class(self, name: str) -> OWLClassExpression:
         """Get or create a new atomic class"""
         Util.debug(f"Getting new atomic concept -> {name}")

fuzzy_dl_owl2/fuzzyowl2/fuzzyowl2_to_fuzzydl.py

@@ -48,7 +48,6 @@ from pyowl2.expressions.data_property import OWLDataProperty
 from pyowl2.expressions.object_property import OWLObjectProperty
 from pyowl2.individual.anonymous_individual import OWLAnonymousIndividual
 from pyowl2.literal.literal import OWLLiteral
-from pyowl2.utils import utils
 
 
 # @utils.timer_decorator
@@ -608,7 +607,7 @@ class FuzzyOwl2ToFuzzyDL(FuzzyOwl2):
         d: float,
     ) -> None:
         self.__write(
-            f"(implies-role {self.get_object_property_name(subproperty)} {self.get_object_property_name(superproperty)} {d})"
+            f"(implies-role {self.get_data_property_name(subproperty)} {self.get_data_property_name(superproperty)} {d})"
         )
 
     def write_sub_property_chain_of_axiom(
@@ -635,9 +634,9 @@ class FuzzyOwl2ToFuzzyDL(FuzzyOwl2):
         self, class_set: set[OWLDataPropertyExpression]
     ) -> None:
         first: OWLDataPropertyExpression = next(class_set)
-        first_name: str = self.get_object_property_name(first)
+        first_name: str = self.get_data_property_name(first)
         for property in class_set - set([first]):
-            property_name: str = self.get_object_property_name(property)
+            property_name: str = self.get_data_property_name(property)
             self.__write(f"(implies-role {first_name} {property_name})")
             self.__write(f"(implies-role {property_name} {first_name})")
 

fuzzy_dl_owl2/fuzzyowl2/parser/owl2_parser.py

@@ -103,11 +103,9 @@ def _parse_fuzzy_nominal(tokens: pp.ParseResults) -> ConceptDefinition:
 def _parse_weighted_complex_concept(tokens: pp.ParseResults) -> ConceptDefinition:
     Util.debug(f"_parse_weighted_complex_concept -> {tokens}")
     list_tokens: list = tokens.as_list()
-    assert isinstance(list_tokens[1], list) and all(
-        isinstance(a, WeightedConcept) for a in list_tokens[1]
-    )
+    assert all(isinstance(a, WeightedConcept) for a in list_tokens[1:])
     wc: list[WeightedConcept] = [
-        typing.cast(WeightedConcept, w) for w in list_tokens[1]
+        typing.cast(WeightedConcept, w) for w in list_tokens[1:]
     ]
     if list_tokens[0] == FuzzyOWL2Keyword.WEIGHTED_MAXIMUM:
         return WeightedMaxConcept(wc)
@@ -221,7 +219,10 @@ class FuzzyOwl2Parser(object):
         concept = pp.Forward()
 
         modified_role_concept = (
-            FuzzyOWL2Keyword.MODIFIED.get_value().suppress()
+            FuzzyOWL2Keyword.CONCEPT.get_value().suppress()
+            + FuzzyOWL2Keyword.TYPE.get_value().suppress()
+            + FuzzyOWL2Keyword.EQUAL.get_value().suppress()
+            + FuzzyOWL2Keyword.MODIFIED.get_value().suppress()
             + FuzzyOWL2Keyword.MODIFIER.get_value().suppress()
             + FuzzyOWL2Keyword.EQUAL.get_value().suppress()
             + variables
@@ -231,13 +232,18 @@ class FuzzyOwl2Parser(object):
         ).add_parse_action(_parse_modified_concept)
 
         weighted_concept = (
-            FuzzyOWL2Keyword.WEIGHTED.get_value().suppress()
+            open_tag
+            + FuzzyOWL2Keyword.CONCEPT.get_value().suppress()
+            + FuzzyOWL2Keyword.TYPE.get_value().suppress()
+            + FuzzyOWL2Keyword.EQUAL.get_value().suppress()
+            + FuzzyOWL2Keyword.WEIGHTED.get_value().suppress()
             + FuzzyOWL2Keyword.DEGREE_VALUE.get_value().suppress()
             + FuzzyOWL2Keyword.EQUAL.get_value().suppress()
             + numbers
             + FuzzyOWL2Keyword.BASE.get_value().suppress()
             + FuzzyOWL2Keyword.EQUAL.get_value().suppress()
             + variables
+            + single_close_tag
         ).add_parse_action(_parse_weighted_concept)
 
         weights = (
@@ -280,7 +286,6 @@ class FuzzyOwl2Parser(object):
             + close_tag
         )
 
-        weighted_list_concept = close_tag + weights + concepts
         q_owa_concept = (
             FuzzyOWL2Keyword.QUANTIFIER.get_value().suppress()
             + FuzzyOWL2Keyword.EQUAL.get_value().suppress()
@@ -318,7 +323,9 @@ class FuzzyOwl2Parser(object):
                                 | FuzzyOWL2Keyword.SUGENO.get_value()
                                 | FuzzyOWL2Keyword.QUASI_SUGENO.get_value()
                             )
-                            + weighted_list_concept
+                            + close_tag
+                            + weights
+                            + concepts
                         ).add_parse_action(_parse_integral_concept)
                         | FuzzyOWL2Keyword.Q_OWA.get_value().suppress() + q_owa_concept
                     )

{fuzzy_dl_owl2-1.0.4.dist-info → fuzzy_dl_owl2-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fuzzy-dl-owl2
-Version: 1.0.4
+Version: 1.0.5
 Summary: A python porting of the Fuzzy Description Language (see https://www.umbertostraccia.it/cs/software/fuzzyDL/fuzzyDL.html) and the Fuzzy OWL 2 framework (see https://www.umbertostraccia.it/cs/software/FuzzyOWL/index.html).
 License: CC-BY-SA-4.0
 Author: Giuseppe Filippone
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: gurobipy (>=12.0.0,<13.0.0)
 Requires-Dist: networkx (>=3.3,<4.0)
 Requires-Dist: owlready2 (>=0.47,<0.48)
-Requires-Dist: pyowl2 (>=1.0.1,<2.0.0)
+Requires-Dist: pyowl2 (>=1.0.2,<2.0.0)
 Requires-Dist: pyparsing (>=3.2.3,<4.0.0)
 Requires-Dist: rdflib (>=7.1.4,<8.0.0)
 Requires-Dist: sortedcontainers (>=2.4.0,<3.0.0)

{fuzzy_dl_owl2-1.0.4.dist-info → fuzzy_dl_owl2-1.0.5.dist-info}/RECORD

@@ -62,7 +62,7 @@ fuzzy_dl_owl2/fuzzydl/exception/__init__.py,sha256=IoYY5IQoU4UYyoB-dFOVLZyDvJN20
 fuzzy_dl_owl2/fuzzydl/exception/fuzzy_ontology_exception.py,sha256=eH1ybBCx1QoZaf8PLCq1rC_3tiBRA-gKCwECTcUUuro,122
 fuzzy_dl_owl2/fuzzydl/exception/inconsistent_ontology_exception.py,sha256=ez0RQN4KGlNRcfB7IXfPz3bM86CFLl6zo-RRTBRpa_o,129
 fuzzy_dl_owl2/fuzzydl/feature_function.py,sha256=KSQvCSYfJK5N6FFfDlyS1Y7UPHSYZNXzdYYZMWzXF8U,6399
-fuzzy_dl_owl2/fuzzydl/fuzzydl_to_owl2.py,sha256=lr4UTDmYsl8MJVwclBTGLrAyDqLqBl8OgCE4tuTvRRM,44989
+fuzzy_dl_owl2/fuzzydl/fuzzydl_to_owl2.py,sha256=BUt-LUHW9VPtUNT74zPblgbClwuQL8_HN6gXMQ2_X8k,46670
 fuzzy_dl_owl2/fuzzydl/general_concept_inclusion.py,sha256=Noom35WAeJosPrliGd9_gvEtcK4BthazsSuZH-cxfyU,2380
 fuzzy_dl_owl2/fuzzydl/individual/__init__.py,sha256=zBCa24kE2nv08VgtphjLshpbGNEARUJgCdtyv9r6JGc,110
 fuzzy_dl_owl2/fuzzydl/individual/created_individual.py,sha256=HOo_UXjPPPtm7B0a7k90kE1veuR9gOCK5hp2f_aaJnY,7653
@@ -124,7 +124,7 @@ fuzzy_dl_owl2/fuzzydl/util/util.py,sha256=5COC79TAJz8fNrRzXLbNpAT9rLd_0KrRI1OU-h
 fuzzy_dl_owl2/fuzzydl/util/utils.py,sha256=TPVLEL9NJXgReuxEIOTEOVYqojSymg_-kyrLETXnYdo,2344
 fuzzy_dl_owl2/fuzzyowl2/__init__.py,sha256=C44P0-Sn35FQdVMqYLzeDWa5qPmokbcs8GPiD_zQaSg,153
 fuzzy_dl_owl2/fuzzyowl2/fuzzyowl2.py,sha256=EAC_DXYa694h3pUZ9T_4Y_f60DjzPUs4VqIGbpLY5vo,71402
-fuzzy_dl_owl2/fuzzyowl2/fuzzyowl2_to_fuzzydl.py,sha256=yWMhk3mpAmGfLSg6buEo8pC2G-Jczy1pgiy3riaZsZY,37033
+fuzzy_dl_owl2/fuzzyowl2/fuzzyowl2_to_fuzzydl.py,sha256=egspxTzY4kNvhsQLP0AAaqJgFUqyO6VJuXLLOej06PA,36994
 fuzzy_dl_owl2/fuzzyowl2/owl_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fuzzy_dl_owl2/fuzzyowl2/owl_types/choquet_concept.py,sha256=ymnyNfvkvWA3y2UMXyPviD0U98vJ6jrX6zddj09SUoI,671
 fuzzy_dl_owl2/fuzzyowl2/owl_types/concept_definition.py,sha256=d5ZsEX8NN-aYJohXGzeJFhrnufCJ6AZ1YLGiclwysDc,324
@@ -153,10 +153,10 @@ fuzzy_dl_owl2/fuzzyowl2/owl_types/weighted_min_concept.py,sha256=_sEao87lwH2fKsp
 fuzzy_dl_owl2/fuzzyowl2/owl_types/weighted_sum_concept.py,sha256=TrX3-M-LrG-5XgEo6LY8JESZpYwcaIX4rOCU8wfWE4k,510
 fuzzy_dl_owl2/fuzzyowl2/owl_types/weighted_sum_zero_concept.py,sha256=OJW8-ZJXvYTFHrqC8hpVBTY6SwLCTTIe72MSAO3H7hk,524
 fuzzy_dl_owl2/fuzzyowl2/parser/__init__.py,sha256=fKaME_uuWyG5UB7VKD-nMV-j95lC1jWV6E6vD59yM4M,27
-fuzzy_dl_owl2/fuzzyowl2/parser/owl2_parser.py,sha256=5eGyRbYUQNH5ZTKCjsOYOsw9Ode4lUl8eUNK4jQGZSs,19683
+fuzzy_dl_owl2/fuzzyowl2/parser/owl2_parser.py,sha256=wSE5FBCfv3t-XePJ9Pzyr_EVFTPWtMrtMyqHNgKd9aw,20052
 fuzzy_dl_owl2/fuzzyowl2/util/__init__.py,sha256=81quoggCuIypZjZs3bbf1Ty70KHdva5RGEJxi0oC57E,25
 fuzzy_dl_owl2/fuzzyowl2/util/constants.py,sha256=05eQLYTB4CxxUZ_T-sNG9FsH8hkrBMAh2y24oiQN8xY,3904
-fuzzy_dl_owl2-1.0.4.dist-info/LICENSE,sha256=er4Z7Ju3OzYUG5mbhh0krYVegIuv4PgehMzihVb2wpc,20131
-fuzzy_dl_owl2-1.0.4.dist-info/METADATA,sha256=elZXmZ96SR3HkFCRcP_CEoojPQ_1UWauCWBuyiLMTvY,13057
-fuzzy_dl_owl2-1.0.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-fuzzy_dl_owl2-1.0.4.dist-info/RECORD,,
+fuzzy_dl_owl2-1.0.5.dist-info/LICENSE,sha256=er4Z7Ju3OzYUG5mbhh0krYVegIuv4PgehMzihVb2wpc,20131
+fuzzy_dl_owl2-1.0.5.dist-info/METADATA,sha256=uPCNsrud2pSsRiLl4hydpRIAehnILDZcLgZF3iLs3y4,13057
+fuzzy_dl_owl2-1.0.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+fuzzy_dl_owl2-1.0.5.dist-info/RECORD,,