fuzzy-dl-owl2 1.0.5__tar.gz → 1.0.7__tar.gz

{fuzzy_dl_owl2-1.0.5 → fuzzy_dl_owl2-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fuzzy-dl-owl2
-Version: 1.0.5
+Version: 1.0.7
 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
@@ -11,12 +11,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 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.2,<2.0.0)
 Requires-Dist: pyparsing (>=3.2.3,<4.0.0)
 Requires-Dist: rdflib (>=7.1.4,<8.0.0)
+Requires-Dist: setuptools (>=80.8.0,<81.0.0)
 Requires-Dist: sortedcontainers (>=2.4.0,<3.0.0)
 Requires-Dist: trycast (>=1.2.0,<2.0.0)
 Project-URL: Repository, https://github.com/giuseppefilippone/fuzzy_dl_owl2
@@ -78,17 +78,85 @@ The file `CONFIG.ini` is structured as follows:
 ```text
 [DEFAULT]
 debugPrint = False
-relaxMilp = False
 epsilon = 0.001
 maxIndividuals = -1
+owlAnnotationLabel = fuzzyLabel
+milpProvider = mip
 ```
 
 | Configuration Variable | Description                       |
 |----------------------|-----------------------------------|
 | debugPrint        | Enable/disable debugging          |
-| relaxMilp      | Enable/disable MILP constraint relaxation. Important: The solution may be wrong by enabling this flag |
 | epsilon | Define the precision of the solution. For instance, epsilon = 0.001 means that the solution will be calculated with an accuracy to the third decimal place |
 | maxIndividuals | Define the maximal number of individuals to handle. The value -1 indicate that there is no maximum |
+| owlAnnotationLabel | Define the Annotation label used to build the Fuzzy OWL 2 RDF/XML ontology |
+| milpProvider | Define the MILP provider used by the reasoner. The supported providers are listed below. |
+
+Supported MILP Providers:
+| Provider | milpProvider |
+|--------------|----------------------|
+| Gurobi | gurobi |
+| CPLEX | pulp_cplex |
+| CBC | pulp |
+| GLPK | pulp_glpk |
+| HiGHS | pulp_highs |
+| MIP | mip |
+
+⸻
+
+# MILP Provider Usage and Configuration
+
+## GUROBI
+
+- Install [gurobipy](https://pypi.org/project/gurobipy/):
+```python
+pip install gurobipy==12.0.0
+```
+- Download the GUROBI license from their [website](https://www.gurobi.com/solutions/licensing/).
+- Add Gurobi to the PATH
+
+## MIP
+
+- Install python [MIP](https://www.python-mip.com/):
+```python
+pip install mip==1.16rc0
+```
+
+## GLPK
+
+- Install [GLPK](https://www.gnu.org/software/glpk/) v5.0 and [GMP](https://gmplib.org/) v6.3.0
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add GLPK to the PATH
+
+## CBC
+
+- Install [CBC](https://github.com/coin-or/Cbc)
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add CBC to the PATH
+
+## CPLEX
+
+- Install [CPLEX](https://www.ibm.com/it-it/products/ilog-cplex-optimization-studio) v22.11
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add CPLEX to the PATH
+
+## HiGHS
+
+- Install [HiGHS](https://ergo-code.github.io/HiGHS/dev/interfaces/cpp/) v1.10.0
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add HiGHS to the PATH
 
 ⸻
 

{fuzzy_dl_owl2-1.0.5 → fuzzy_dl_owl2-1.0.7}/README.md

@@ -54,17 +54,85 @@ The file `CONFIG.ini` is structured as follows:
 ```text
 [DEFAULT]
 debugPrint = False
-relaxMilp = False
 epsilon = 0.001
 maxIndividuals = -1
+owlAnnotationLabel = fuzzyLabel
+milpProvider = mip
 ```
 
 | Configuration Variable | Description                       |
 |----------------------|-----------------------------------|
 | debugPrint        | Enable/disable debugging          |
-| relaxMilp      | Enable/disable MILP constraint relaxation. Important: The solution may be wrong by enabling this flag |
 | epsilon | Define the precision of the solution. For instance, epsilon = 0.001 means that the solution will be calculated with an accuracy to the third decimal place |
 | maxIndividuals | Define the maximal number of individuals to handle. The value -1 indicate that there is no maximum |
+| owlAnnotationLabel | Define the Annotation label used to build the Fuzzy OWL 2 RDF/XML ontology |
+| milpProvider | Define the MILP provider used by the reasoner. The supported providers are listed below. |
+
+Supported MILP Providers:
+| Provider | milpProvider |
+|--------------|----------------------|
+| Gurobi | gurobi |
+| CPLEX | pulp_cplex |
+| CBC | pulp |
+| GLPK | pulp_glpk |
+| HiGHS | pulp_highs |
+| MIP | mip |
+
+⸻
+
+# MILP Provider Usage and Configuration
+
+## GUROBI
+
+- Install [gurobipy](https://pypi.org/project/gurobipy/):
+```python
+pip install gurobipy==12.0.0
+```
+- Download the GUROBI license from their [website](https://www.gurobi.com/solutions/licensing/).
+- Add Gurobi to the PATH
+
+## MIP
+
+- Install python [MIP](https://www.python-mip.com/):
+```python
+pip install mip==1.16rc0
+```
+
+## GLPK
+
+- Install [GLPK](https://www.gnu.org/software/glpk/) v5.0 and [GMP](https://gmplib.org/) v6.3.0
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add GLPK to the PATH
+
+## CBC
+
+- Install [CBC](https://github.com/coin-or/Cbc)
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add CBC to the PATH
+
+## CPLEX
+
+- Install [CPLEX](https://www.ibm.com/it-it/products/ilog-cplex-optimization-studio) v22.11
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add CPLEX to the PATH
+
+## HiGHS
+
+- Install [HiGHS](https://ergo-code.github.io/HiGHS/dev/interfaces/cpp/) v1.10.0
+- Install python [pulp](https://github.com/coin-or/PuLP?tab=readme-ov-file):
+```python
+pip install pulp==3.2.1
+```
+- Add HiGHS to the PATH
 
 ⸻
 

{fuzzy_dl_owl2-1.0.5 → fuzzy_dl_owl2-1.0.7}/fuzzy_dl_owl2/fuzzydl/feature_function.py

@@ -122,26 +122,32 @@ class FeatureFunction:
         self, a: Individual, milp: MILPHelper
     ) -> typing.Optional[Expression]:
         if self.type == FeatureFunctionType.ATOMIC:
+            # Get the filler "b" for feature(a)
             rel_set: list[Relation] = a.role_relations.get(self.feature)
+            assert len(rel_set) > 0
             b: CreatedIndividual = typing.cast(
                 CreatedIndividual, rel_set[0].get_object_individual()
             )
+            # Get the variable xB
             x_b: Variable = milp.get_variable(b)
             return Expression(Term(1.0, x_b))
         elif self.type == FeatureFunctionType.NUMBER:
             return Expression(self.n)
         elif self.type == FeatureFunctionType.PRODUCT:
+            assert len(self.f) == 1
             ex: Expression = self.f[0].to_expression(a, milp)
-            return Expression.multiply_constant(ex, self.n)
+            return ex * self.n
         elif self.type == FeatureFunctionType.SUBTRACTION:
+            assert len(self.f) == 2
             ex1: Expression = self.f[0].to_expression(a, milp)
             ex2: Expression = self.f[1].to_expression(a, milp)
-            return Expression.subtract_expressions(ex1, ex2)
+            return ex1 - ex2
         elif self.type == FeatureFunctionType.SUM:
+            assert len(self.f) >= 1
             ex1: Expression = self.f[0].to_expression(a, milp)
             for i in range(1, len(self.f)):
                 ex2: Expression = self.f[i].to_expression(a, milp)
-                ex1: Expression = Expression.add_expressions(ex1, ex2)
+                ex1 = ex1 + ex2
             return ex1
         return None
 

{fuzzy_dl_owl2-1.0.5 → fuzzy_dl_owl2-1.0.7}/fuzzy_dl_owl2/fuzzydl/fuzzydl_to_owl2.py

@@ -64,6 +64,7 @@ from fuzzy_dl_owl2.fuzzydl.util import constants
 from fuzzy_dl_owl2.fuzzydl.util.constants import ConceptType, ConcreteFeatureType
 from fuzzy_dl_owl2.fuzzydl.util.util import Util
 from fuzzy_dl_owl2.fuzzyowl2.util.constants import FuzzyOWL2Keyword
+from fuzzy_dl_owl2.fuzzyowl2.util.fuzzy_xml import FuzzyXML
 from pyowl2.abstracts.axiom import OWLAxiom
 from pyowl2.abstracts.class_expression import OWLClassExpression
 from pyowl2.abstracts.data_range import OWLDataRange
@@ -128,6 +129,8 @@ from pyowl2.individual.named_individual import OWLNamedIndividual
 from pyowl2.literal.literal import OWLLiteral
 from pyowl2.ontology import OWLOntology
 
+from fuzzy_dl_owl2.fuzzydl.util.config_reader import ConfigReader
+
 
 # @utils.timer_decorator
 class FuzzydlToOwl2:
@@ -148,7 +151,7 @@ class FuzzydlToOwl2:
             self.ontology_iri, OWL1_annotations=True
         )
         self.fuzzyLabel: OWLAnnotationProperty = OWLAnnotationProperty(
-            IRI(self.ontology_iri.namespace, "fuzzyLabel")
+            IRI(self.ontology_iri.namespace, ConfigReader.OWL_ANNOTATION_LABEL)
         )
 
         self.ontology.add_axiom(OWLDeclaration(self.fuzzyLabel))
@@ -276,11 +279,24 @@ class FuzzydlToOwl2:
             c4: OWLClassExpression = self.get_new_atomic_class(str(c))
             c3: OWLClassExpression = self.get_base(c.c1)
             self.concepts[str(c)] = c3
-            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()}="{FuzzyOWL2Keyword.MODIFIED.get_str_value()}" {FuzzyOWL2Keyword.MODIFIER.get_str_value()}="{self.modifiers[str(c)]}" {FuzzyOWL2Keyword.BASE.get_str_value()}="{c3}"/>\n',
-                f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>",
+
+            main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.CONCEPT.get_str_value())
+            concept_xml = FuzzyXML.build_concept_xml(
+                FuzzyOWL2Keyword.MODIFIED.get_str_value(),
+                {
+                    FuzzyOWL2Keyword.MODIFIER.get_str_value(): str(
+                        self.modifiers[str(c)]
+                    ),
+                    FuzzyOWL2Keyword.BASE.get_str_value(): str(c3),
+                },
             )
+            main_xml.append(concept_xml)
+            annotation: str = FuzzyXML.to_str(main_xml)
+            # 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()}="{FuzzyOWL2Keyword.MODIFIED.get_str_value()}" {FuzzyOWL2Keyword.MODIFIER.get_str_value()}="{self.modifiers[str(c)]}" {FuzzyOWL2Keyword.BASE.get_str_value()}="{c3}"/>\n',
+            #     f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>",
+            # )
             self.add_entity_annotation(annotation, c4)
             return c4
         elif c_type == ConceptType.SELF:
@@ -331,11 +347,22 @@ class FuzzydlToOwl2:
             c: WeightedConcept = typing.cast(WeightedConcept, c)
             c4: OWLClassExpression = self.get_new_atomic_class(str(c))
             c3: OWLClassExpression = self.get_base(c.c1)
-            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()}="{FuzzyOWL2Keyword.WEIGHTED.get_str_value()}" {FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value()}="{c.weight}" {FuzzyOWL2Keyword.BASE.get_str_value()}="{c3}"/>\n',
-                f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>",
+
+            main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.CONCEPT.get_str_value())
+            concept_xml = FuzzyXML.build_concept_xml(
+                FuzzyOWL2Keyword.WEIGHTED.get_str_value(),
+                {
+                    FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value(): str(c.weight),
+                    FuzzyOWL2Keyword.BASE.get_str_value(): str(c3),
+                },
             )
+            main_xml.append(concept_xml)
+            annotation: str = FuzzyXML.to_str(main_xml)
+            # 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()}="{FuzzyOWL2Keyword.WEIGHTED.get_str_value()}" {FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value()}="{c.weight}" {FuzzyOWL2Keyword.BASE.get_str_value()}="{c3}"/>\n',
+            #     f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>",
+            # )
             self.add_entity_annotation(annotation, c3)
             return c4
         elif c_type in (
@@ -378,16 +405,33 @@ class FuzzydlToOwl2:
         curr_concept: HasWeightedConceptsInterface = type_cast[c.type](c)
         c3: OWLClassExpression = self.get_new_atomic_class(str(curr_concept))
 
-        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]}">\n ',
-        )
+        main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.CONCEPT.get_str_value())
+        concept_xml = FuzzyXML.build_concept_xml(type_dict[c.type])
         for i in range(len(curr_concept.concepts)):
             c5: OWLClassExpression = self.get_base(curr_concept.concepts[i])
-            annotation += f'\t\t<{FuzzyOWL2Keyword.CONCEPT.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{FuzzyOWL2Keyword.WEIGHTED.get_str_value()}" {FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value()}="{curr_concept.weights[i]}" {FuzzyOWL2Keyword.BASE.get_str_value()}="{c5}" />\n'
-        annotation: str = (
-            f"\t</{FuzzyOWL2Keyword.CONCEPT.get_tag_name()} >\n</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} >"
-        )
+            sub_concept_xml = FuzzyXML.build_concept_xml(
+                FuzzyOWL2Keyword.WEIGHTED.get_str_value(),
+                {
+                    FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value(): str(
+                        curr_concept.weights[i]
+                    ),
+                    FuzzyOWL2Keyword.BASE.get_str_value(): str(c5),
+                },
+            )
+            concept_xml.append(sub_concept_xml)
+        main_xml.append(concept_xml)
+        annotation: str = FuzzyXML.to_str(main_xml)
+
+        # 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]}">\n ',
+        # )
+        # for i in range(len(curr_concept.concepts)):
+        #     c5: OWLClassExpression = self.get_base(curr_concept.concepts[i])
+        #     annotation += f'\t\t<{FuzzyOWL2Keyword.CONCEPT.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{FuzzyOWL2Keyword.WEIGHTED.get_str_value()}" {FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value()}="{curr_concept.weights[i]}" {FuzzyOWL2Keyword.BASE.get_str_value()}="{c5}" />\n'
+        # annotation: str = (
+        #     f"\t</{FuzzyOWL2Keyword.CONCEPT.get_tag_name()} >\n</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} >"
+        # )
         self.add_entity_annotation(annotation, c3)
         return c3
 
@@ -411,18 +455,31 @@ class FuzzydlToOwl2:
             return None
         curr_concept: HasWeightedConceptsInterface = 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]}">\n',
-            f"\t\t<{FuzzyOWL2Keyword.WEIGHTS.get_tag_name()}>\n",
+
+        main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.CONCEPT.get_str_value())
+        concept_xml = FuzzyXML.build_concept_xml(type_dict[c.type])
+        weights_xml = FuzzyXML.build_weights_xml(curr_concept.weights)
+        names_xml = FuzzyXML.build_names_xml(
+            [self.get_base(ci) for ci in curr_concept.concepts]
         )
-        for d in curr_concept.weights:
-            annotation += f"\t\t\t<{FuzzyOWL2Keyword.WEIGHT.get_tag_name()}>{d}</{FuzzyOWL2Keyword.WEIGHT.get_tag_name()}>\n"
-        annotation += f"\t\t</{FuzzyOWL2Keyword.WEIGHTS.get_tag_name()}>\n\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()}>"
+        concept_xml.append(weights_xml)
+        concept_xml.append(names_xml)
+        main_xml.append(concept_xml)
+        annotation: str = FuzzyXML.to_str(main_xml)
+
+        # 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]}">\n',
+        #     f"\t\t<{FuzzyOWL2Keyword.WEIGHTS.get_tag_name()}>\n",
+        # )
+        # for d in curr_concept.weights:
+        #     annotation += f"\t\t\t<{FuzzyOWL2Keyword.WEIGHT.get_tag_name()}>{d}</{FuzzyOWL2Keyword.WEIGHT.get_tag_name()}>\n"
+        # annotation += f"\t\t</{FuzzyOWL2Keyword.WEIGHTS.get_tag_name()}>\n\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
 
@@ -438,15 +495,27 @@ class FuzzydlToOwl2:
             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",
+
+        main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.CONCEPT.get_str_value())
+        concept_xml = FuzzyXML.build_concept_xml(
+            type_dict[c.type],
+            {FuzzyOWL2Keyword.QUANTIFIER.get_str_value(): str(curr_concept.quantifier)},
+        )
+        names_xml = FuzzyXML.build_names_xml(
+            [self.get_base(ci) for ci in curr_concept.concepts]
         )
-        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()}>"
+        concept_xml.append(names_xml)
+        main_xml.append(concept_xml)
+        annotation: str = FuzzyXML.to_str(main_xml)
+        # 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_str_value()}="{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
 
@@ -549,11 +618,16 @@ class FuzzydlToOwl2:
         elif isinstance(value, DegreeNumeric):  # Degree object
             n = value.get_numerical_value()
 
-        annotation_text: str = (
-            f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.AXIOM.get_str_value()}">\n'
-            f'\t<{FuzzyOWL2Keyword.DEGREE_DEF.get_tag_name()} {FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value()}="{n}"/>\n'
-            f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
-        )
+        main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.AXIOM.get_str_value())
+        degree_xml = FuzzyXML.build_degree_xml(n)
+        main_xml.append(degree_xml)
+        annotation_text: str = FuzzyXML.to_str(main_xml)
+
+        # annotation_text: str = (
+        #     f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.AXIOM.get_str_value()}">\n'
+        #     f'\t<{FuzzyOWL2Keyword.DEGREE_DEF.get_tag_name()} {FuzzyOWL2Keyword.DEGREE_VALUE.get_str_value()}="{n}"/>\n'
+        #     f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+        # )
         annotation: OWLAnnotation = self.to_owl_annotation(annotation_text)
         return set([annotation])
 
@@ -590,11 +664,17 @@ class FuzzydlToOwl2:
         logic = str(constants.KNOWLEDGE_BASE_SEMANTICS)
 
         if logic:
-            annotation: str = (
-                f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.ONTOLOGY.get_str_value()}">\n'
-                f'\t<{FuzzyOWL2Keyword.FUZZY_LOGIC.get_tag_name()} {FuzzyOWL2Keyword.LOGIC.get_str_value()}="{logic}" />\n'
-                f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+            main_xml = FuzzyXML.build_main_xml(
+                FuzzyOWL2Keyword.ONTOLOGY.get_str_value()
             )
+            logic_xml = FuzzyXML.build_logic_xml(logic)
+            main_xml.append(logic_xml)
+            annotation: str = FuzzyXML.to_str(main_xml)
+            # annotation: str = (
+            #     f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.ONTOLOGY.get_str_value()}">\n'
+            #     f'\t<{FuzzyOWL2Keyword.FUZZY_LOGIC.get_tag_name()} {FuzzyOWL2Keyword.LOGIC.get_str_value()}="{logic}" />\n'
+            #     f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+            # )
             self.add_ontology_annotation(annotation)
 
         # Process concrete concepts
@@ -813,7 +893,8 @@ class FuzzydlToOwl2:
         current_datatype: OWLDatatype = OWLDatatype(self.iri(c))
         self.datatypes[str(c)] = current_datatype
 
-        specific: str = self._get_concrete_concept_specifics(c)
+        # specific: str = self._get_concrete_concept_specifics(c)
+        specific: tuple[str, dict[str, str]] = self._get_concrete_concept_specifics(c)
 
         int_datatype: OWLDatatype = OWLDatatype(XSD.integer)
         greater_than: OWLDatatypeRestriction = OWLDatatypeRestriction(
@@ -843,45 +924,102 @@ class FuzzydlToOwl2:
         self.ontology.add_axiom(OWLDeclaration(current_datatype))
         self.ontology.add_axiom(definition)
 
-        annotation: str = (
-            f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.DATATYPE.get_str_value()}">\n'
-            f'\t<{FuzzyOWL2Keyword.DATATYPE.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{specific}"/>\n'
-            f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
-        )
+        main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.DATATYPE.get_str_value())
+        datatype_xml = FuzzyXML.build_datatype_xml(specific[0], specific[1])
+        main_xml.append(datatype_xml)
+        annotation: str = FuzzyXML.to_str(main_xml)
+
+        # annotation: str = (
+        #     f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.DATATYPE.get_str_value()}">\n'
+        #     f'\t<{FuzzyOWL2Keyword.DATATYPE.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{specific}"/>\n'
+        #     f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+        # )
         self.add_entity_annotation(annotation, current_datatype)
 
-    def _get_concrete_concept_specifics(self, c: FuzzyConcreteConcept) -> str:
+    def _get_concrete_concept_specifics(
+        self, c: FuzzyConcreteConcept
+    ) -> tuple[str, dict[str, str]]:
         """Get concrete concept specific parameters"""
         if isinstance(c, CrispConcreteConcept):
-            return f'{FuzzyOWL2Keyword.CRISP.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}'
+            return FuzzyOWL2Keyword.CRISP.get_str_value(), {
+                FuzzyOWL2Keyword.A.get_str_value(): str(c.a),
+                FuzzyOWL2Keyword.B.get_str_value(): str(c.b),
+            }
         elif isinstance(c, LeftConcreteConcept):
-            return f'{FuzzyOWL2Keyword.LEFT_SHOULDER.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}'
+            return FuzzyOWL2Keyword.LEFT_SHOULDER.get_str_value(), {
+                FuzzyOWL2Keyword.A.get_str_value(): str(c.a),
+                FuzzyOWL2Keyword.B.get_str_value(): str(c.b),
+            }
         elif isinstance(c, RightConcreteConcept):
-            return f'{FuzzyOWL2Keyword.RIGHT_SHOULDER.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}'
+            return FuzzyOWL2Keyword.RIGHT_SHOULDER.get_str_value(), {
+                FuzzyOWL2Keyword.A.get_str_value(): str(c.a),
+                FuzzyOWL2Keyword.B.get_str_value(): str(c.b),
+            }
         elif isinstance(c, TriangularConcreteConcept):
-            return f'{FuzzyOWL2Keyword.TRIANGULAR.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}" {FuzzyOWL2Keyword.C.get_str_value()}="{c.c}'
+            return FuzzyOWL2Keyword.TRIANGULAR.get_str_value(), {
+                FuzzyOWL2Keyword.A.get_str_value(): str(c.a),
+                FuzzyOWL2Keyword.B.get_str_value(): str(c.b),
+                FuzzyOWL2Keyword.C.get_str_value(): str(c.c),
+            }
         elif isinstance(c, TrapezoidalConcreteConcept):
-            return f'{FuzzyOWL2Keyword.TRAPEZOIDAL.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}" {FuzzyOWL2Keyword.C.get_str_value()}="{c.c}" {FuzzyOWL2Keyword.D.get_str_value()}="{c.d}'
-        return ""
+            return FuzzyOWL2Keyword.TRAPEZOIDAL.get_str_value(), {
+                FuzzyOWL2Keyword.A.get_str_value(): str(c.a),
+                FuzzyOWL2Keyword.B.get_str_value(): str(c.b),
+                FuzzyOWL2Keyword.C.get_str_value(): str(c.c),
+                FuzzyOWL2Keyword.D.get_str_value(): str(c.d),
+            }
+        return "", dict()
+
+    # def _get_concrete_concept_specifics(self, c: FuzzyConcreteConcept) -> str:
+    #     """Get concrete concept specific parameters"""
+    #     if isinstance(c, CrispConcreteConcept):
+    #         return f'{FuzzyOWL2Keyword.CRISP.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}'
+    #     elif isinstance(c, LeftConcreteConcept):
+    #         return f'{FuzzyOWL2Keyword.LEFT_SHOULDER.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}'
+    #     elif isinstance(c, RightConcreteConcept):
+    #         return f'{FuzzyOWL2Keyword.RIGHT_SHOULDER.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}'
+    #     elif isinstance(c, TriangularConcreteConcept):
+    #         return f'{FuzzyOWL2Keyword.TRIANGULAR.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}" {FuzzyOWL2Keyword.C.get_str_value()}="{c.c}'
+    #     elif isinstance(c, TrapezoidalConcreteConcept):
+    #         return f'{FuzzyOWL2Keyword.TRAPEZOIDAL.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{c.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{c.b}" {FuzzyOWL2Keyword.C.get_str_value()}="{c.c}" {FuzzyOWL2Keyword.D.get_str_value()}="{c.d}'
+    #     return ""
 
     def _process_modifier(self, mod: Modifier) -> None:
         """Process a modifier"""
         Util.debug(f"Process modifier -> {mod}")
+
+        main_xml = FuzzyXML.build_main_xml(FuzzyOWL2Keyword.MODIFIER.get_str_value())
+
         if isinstance(mod, LinearModifier):
-            annotation: str = (
-                f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.MODIFIER.get_str_value()}">\n'
-                f'\t<{FuzzyOWL2Keyword.MODIFIER.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{FuzzyOWL2Keyword.LINEAR.get_str_value()}" {FuzzyOWL2Keyword.C.get_str_value()}="{mod.c}"/>\n'
-                f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+            modifier_xml = FuzzyXML.build_modifier_xml(
+                FuzzyOWL2Keyword.LINEAR.get_str_value(),
+                {FuzzyOWL2Keyword.C.get_str_value(): str(mod.c)},
             )
+            # annotation: str = (
+            #     f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.MODIFIER.get_str_value()}">\n'
+            #     f'\t<{FuzzyOWL2Keyword.MODIFIER.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{FuzzyOWL2Keyword.LINEAR.get_str_value()}" {FuzzyOWL2Keyword.C.get_str_value()}="{mod.c}"/>\n'
+            #     f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+            # )
         elif isinstance(mod, TriangularModifier):
-            annotation: str = (
-                f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.MODIFIER.get_str_value()}">\n'
-                f'\t<{FuzzyOWL2Keyword.MODIFIER.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{FuzzyOWL2Keyword.TRIANGULAR.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{mod.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{mod.b}" {FuzzyOWL2Keyword.C.get_str_value()}="{mod.c}"/>\n'
-                f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+            modifier_xml = FuzzyXML.build_modifier_xml(
+                FuzzyOWL2Keyword.TRIANGULAR.get_str_value(),
+                {
+                    FuzzyOWL2Keyword.A.get_str_value(): str(mod.a),
+                    FuzzyOWL2Keyword.B.get_str_value(): str(mod.b),
+                    FuzzyOWL2Keyword.C.get_str_value(): str(mod.c),
+                },
             )
+            # annotation: str = (
+            #     f'<{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()} {FuzzyOWL2Keyword.FUZZY_TYPE.get_str_value()}="{FuzzyOWL2Keyword.MODIFIER.get_str_value()}">\n'
+            #     f'\t<{FuzzyOWL2Keyword.MODIFIER.get_tag_name()} {FuzzyOWL2Keyword.TYPE.get_str_value()}="{FuzzyOWL2Keyword.TRIANGULAR.get_str_value()}" {FuzzyOWL2Keyword.A.get_str_value()}="{mod.a}" {FuzzyOWL2Keyword.B.get_str_value()}="{mod.b}" {FuzzyOWL2Keyword.C.get_str_value()}="{mod.c}"/>\n'
+            #     f"</{FuzzyOWL2Keyword.FUZZY_OWL_2.get_str_value()}>"
+            # )
         else:
             raise ValueError(f"Unknown modifier type: {type(mod)}")
 
+        main_xml.append(modifier_xml)
+        annotation: str = FuzzyXML.to_str(main_xml)
+
         current_datatype: OWLDatatype = OWLDatatype(self.iri(mod))
         self.modifiers[str(mod)] = current_datatype
         self.ontology.add_axiom(OWLDeclaration(current_datatype))