Finish TP1 exo1

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/TP1/exo1/TP1prog1.py b/TP1/exo1/TP1prog1.py
index f0e5324713a1b6409b1e6bc6c9b36fa790a96465..9953cf7cfcd18eab97f34d2aa3f8734db0c978f2 100755 (executable)
--- a/TP1/exo1/TP1prog1.py
+++ b/TP1/exo1/TP1prog1.py
@@ -9,17 +9,70 @@ irisData = load_iris()
 X = irisData.data
 Y = irisData.target
 
+colors = ["red", "green", "blue"]
+
 x = 0
 y = 1
+for i in range(3):
+    pl.scatter(X[Y == i][:, x], X[Y == i][:, y], color=colors[i],
+               label=irisData.target_names[i])
+pl.legend()
+pl.xlabel(irisData.feature_names[x])
+pl.ylabel(irisData.feature_names[y])
+pl.title(u"Données Iris - dimension des sépales uniquement")
+pl.show()
 
-colors = ["red", "green", "blue"]
+x = 2
+y = 3
+for i in range(3):
+    pl.scatter(X[Y == i][:, x], X[Y == i][:, y], color=colors[i],
+               label=irisData.target_names[i])
+pl.legend()
+pl.xlabel(irisData.feature_names[x])
+pl.ylabel(irisData.feature_names[y])
+pl.title(u"Données Iris - dimension des pétales uniquement")
+pl.show()
+
+x = 0
+y = 3
+for i in range(3):
+    pl.scatter(X[Y == i][:, x], X[Y == i][:, y], color=colors[i],
+               label=irisData.target_names[i])
+pl.legend()
+pl.xlabel(irisData.feature_names[x])
+pl.ylabel(irisData.feature_names[y])
+pl.title(u"Données Iris - dimension des sépales et pétales")
+pl.show()
+
+x = 1
+y = 2
+for i in range(3):
+    pl.scatter(X[Y == i][:, x], X[Y == i][:, y], color=colors[i],
+               label=irisData.target_names[i])
+pl.legend()
+pl.xlabel(irisData.feature_names[x])
+pl.ylabel(irisData.feature_names[y])
+pl.title(u"Données Iris - dimension des sépales et pétales")
+pl.show()
 
+x = 0
+y = 2
 for i in range(3):
     pl.scatter(X[Y == i][:, x], X[Y == i][:, y], color=colors[i],
                label=irisData.target_names[i])
+pl.legend()
+pl.xlabel(irisData.feature_names[x])
+pl.ylabel(irisData.feature_names[y])
+pl.title(u"Données Iris - dimension des sépales et pétales")
+pl.show()
 
+x = 1
+y = 3
+for i in range(3):
+    pl.scatter(X[Y == i][:, x], X[Y == i][:, y], color=colors[i],
+               label=irisData.target_names[i])
 pl.legend()
 pl.xlabel(irisData.feature_names[x])
 pl.ylabel(irisData.feature_names[y])
-pl.title(u"Données Iris - dimension des sépales uniquement")
+pl.title(u"Données Iris - dimension des sépales et pétales")
 pl.show()

diff --git a/TP1/exo1/iris4.py b/TP1/exo1/iris4.py
index 66465617c2dc63bf4f5e51471b3d7a1dea994422..ad61e2d2b6502f1a3d9e3bf3550462967e842c6e 100755 (executable)
--- a/TP1/exo1/iris4.py
+++ b/TP1/exo1/iris4.py
@@ -9,9 +9,9 @@ X = irisData.data
 Y = irisData.target
 x = 0
 y = 1
-Y == 0
-X[Y == 0]
-X[Y == 0][:, x]
+print(Y == 0)
+print(X[Y == 0])
+print(X[Y == 0][:, x])
 pl.scatter(X[Y == 0][:, x], X[Y == 0][:, y],
            color="red", label=irisData.target_names[0])
 pl.scatter(X[Y == 1][:, x], X[Y == 1][:, y],