From 064753b94d164ababd062d55d14c1eeecdf4f427 Mon Sep 17 00:00:00 2001
From: Djalim Simaila <djalim.simaila@etu.univ-amu.fr>
Date: Tue, 26 Mar 2024 10:40:09 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(mcd=5Fmocodo.py):?=
 =?UTF-8?q?=20extract=20text=20generation=20logic=20into=20a=20separate=20?=
 =?UTF-8?q?function=20for=20better=20code=20organization=20and=20reusabili?=
 =?UTF-8?q?ty=20=E2=9C=A8=20feat(mocodo=5Fnotebook.ipynb):=20add=20functio?=
 =?UTF-8?q?ns=20to=20generate=20types=20and=20MLD=20from=20a=20domain=20ex?=
 =?UTF-8?q?pressed=20in=20MCD=20mocodo=20for=20enhanced=20functionality?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mcd_mocodo.py         | 19 +++++++++++--------
 mocodo_notebook.ipynb | 31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/mcd_mocodo.py b/mcd_mocodo.py
index f2e5582..15ad482 100644
--- a/mcd_mocodo.py
+++ b/mcd_mocodo.py
@@ -116,13 +116,16 @@ domaines = [
     test,
 ]
 
-texte_complet = ""
-for domaine in domaines:
+def generer_texte_complet(domaines, entités):
+    texte_complet = ""
+    for domaine in domaines:
+        for entite in entités:
+            if entite in domaine: 
+                domaine = domaine.replace(entite, "")
+        texte_complet += domaine
+
     for entite in entités:
-        if entite in domaine: 
-            domaine = domaine.replace(entite, "")
-    texte_complet += domaine
-
-for entite in entités:
-    texte_complet += entite
+        texte_complet += entite
+    return texte_complet
 
+texte_complet = generer_texte_complet(domaines, entités)
\ No newline at end of file
diff --git a/mocodo_notebook.ipynb b/mocodo_notebook.ipynb
index a2e271f..ffef2b6 100644
--- a/mocodo_notebook.ipynb
+++ b/mocodo_notebook.ipynb
@@ -1383,6 +1383,37 @@
    "source": [
     "generer_mmd(mcd.texte_complet)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def generer_types(domaine:str):\n",
+    "    \"\"\"\n",
+    "    Infère les types des attribut d'un domaine exprimé en MCD mocodo.\n",
+    "    \n",
+    "    :param domaine: Le domaine exprimé en MCD mocodo\n",
+    "    :type domaine: str\n",
+    "    \"\"\"\n",
+    "    return mocodo(f\"\"\"\n",
+    "    %mocodo -t create:types=TODO --select rw\n",
+    "    {domaine}\n",
+    "    \"\"\")\n",
+    "\n",
+    "def generer_mld(domaine:str):\n",
+    "    \"\"\"\n",
+    "    Genère un MLD textuel à partir d'un domaine exprimé en MCD mocodo.\n",
+    "    \n",
+    "    :param domaine: Le domaine exprimé en MCD mocodo\n",
+    "    :type domaine: str\n",
+    "    \"\"\"\n",
+    "    return mocodo(f\"\"\"\n",
+    "    %mocodo -t mld\n",
+    "    {domaine}\n",
+    "    \"\"\")"
+   ]
   }
  ],
  "metadata": {