Clean up scripts

tp1-kmeans.py

@@ -16,15 +16,13 @@ dataset_name = "xclara"
 
 save = True
 
-# Extraction et visualisation d'un dataset 2D
+print("-----------------------------------------------------------")
+print("     Chargement du dataset : " + dataset_name)
 data = extract_data_2d(path + dataset_name)
 print_2d_data(data, dataset_name=dataset_name+"_brute", stop=False, save=save)
 
-# Extraction et visualisation d'un dataset 3D
-data_golfball = extract_data_3d(path+"golfball")
-print_3d_data(data_golfball, dataset_name="golfball", stop=False, save=save)
-
-# Scaling des data 2D et visualisation
+print("-----------------------------------------------------------")
+print("     Mise à l'échelle")
 data_scaled = scale_data(data)
 print_2d_data(data_scaled, dataset_name=dataset_name +
               "_scaled", stop=False, save=save)

tp2-agglo.py

@@ -30,6 +30,9 @@ path = './artificial/'
 dataset_name = "xclara"
 save = True
 
+# Types de linkage : single, average, complete, ward linkage
+linkage = "complete"
+
 print("-----------------------------------------------------------")
 print("     Chargement du dataset : " + dataset_name)
 data = extract_data_2d(path + dataset_name)
@@ -42,16 +45,13 @@ data_scaled = scale_data(data)
 print_2d_data(data_scaled, dataset_name=dataset_name +
               "_scaled", stop=False, save=save)
 
-# Types de linkage : single, average, complete, ward linkage
-linkage = "complete"
-
 print("-----------------------------------------------------------")
 print("     Création du dendrogramme : linkage " + linkage)
 print_dendrogramme(data_scaled, dataset_name=dataset_name,
                    linkage=linkage, stop=False)
 
 
-k_max = 10
+k_max = 20
 print("-----------------------------------------------------------")
 print("     Création clusters : linkage " +
       linkage + ", k=(0 to " + str(k_max) + ")")