Creation package + interface

src/clustering/__init__.py

+__all__ = ["interface"]
\ No newline at end of file

src/cha.py → src/clustering/cha.py

 from typing import List, Tuple
-from arbre_binaire import ArbreBinaire
-from reseau import Reseau
+from .arbre_binaire import ArbreBinaire
+from .reseau import Reseau
 
 
 def cha(reseau: Reseau, type_distance: str = "min"):

src/demo_jupyter.py → src/clustering/demo_jupyter.py

 #%%
-from make_clusters import creer_reseau
-import cha
+from .make_clusters import creer_reseau
+from . import cha
 
 #%%
 reseauEn = creer_reseau("out/scoreAllEn.csv")

src/get_scores.py → src/clustering/get_scores.py

@@ -55,7 +55,8 @@ def calculate_scoreNormalise(src: str, out: str):
 
 
 if __name__ == "__main__":
-    calculate_score("./data/listeMotsHaptiques.csv", "./data/scoreAllEn.csv", "En")
+    calculate_score("./data/listeMotsHaptiques.csv", "./out/scoreAllEn.csv", "En")
     Lesk.setLang("fra")
-    calculate_score("./data/listeMotsHaptiques.csv", "out/scoreAllFr.csv", "Fr")
-    # calculate_scoreNormalise("./data/scoreAllEn.csv","./data/scoreAllEnNormalise.csv")
+    calculate_score("./data/listeMotsHaptiques.csv", "./out/scoreAllFr.csv", "Fr")
+    calculate_scoreNormalise("./out/scoreAllEn.csv","./out/scoreAllEnNormalise.csv")
+    calculate_scoreNormalise("./out/scoreAllFr.csv","./out/scoreAllFrNormalise.csv")

src/clustering/interface.py

+from . import make_clusters
+from .import cha 
+
+from .reseau import Reseau
+from .arbre_binaire import ArbreBinaire
+
+def creer_reseau(src: str) -> Reseau:
+    return make_clusters.creer_reseau(src)
+
+def cha(reseau: Reseau, type_distance: str = "min"):
+    return cha.cha(reseau, type_distance)
+
+def decouper_clusters(cluster_racine: ArbreBinaire, nb_clusters: int):
+    return cha.decouper_clusters(cluster_racine, nb_clusters)
+
+def clusters_to_string(liste_clusters):
+    return cha.clusters_to_string(liste_clusters)
\ No newline at end of file

src/make_clusters.py → src/clustering/make_clusters.py

@@ -4,8 +4,8 @@ import numpy as np
 from scipy.cluster.hierarchy import dendrogram, linkage
 from scipy.spatial.distance import squareform
 from matplotlib import pyplot as plt
-from reseau import Reseau
-from cha import cha, decouper_clusters
+from .reseau import Reseau
+from .cha import cha, decouper_clusters
 
 
 def creer_reseau(src: str) -> Reseau:

src/reseau.py → src/clustering/reseau.py

-from noeud import Noeud
+from .noeud import Noeud
 from typing import List, Tuple, Dict
 
 

src/test_Lesk.py → src/clustering/test/test_Lesk.py

-from lesk import Lesk
+from ..lesk import Lesk
 from nltk.corpus import wordnet
 import pytest
 

src/serveur.py

@@ -4,8 +4,7 @@ from flask import Flask, jsonify
 from flask_restful import Api, Resource, reqparse
 from flask_cors import CORS
 
-from make_clusters import creer_reseau
-from cha import cha, decouper_clusters, clusters_to_string
+from clustering.interface import creer_reseau,cha, decouper_clusters, clusters_to_string
 
 reseauEn = creer_reseau("../out/scoreAllEn.csv")
 reseauFr = creer_reseau("../out/scoreAllFr.csv")