From df09eefa3b303c0f773c8fd810f87cc155b5c073 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 13 Nov 2018 19:14:29 +0100 Subject: [PATCH] Fixes and code cleanup. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- TP3/exo2/tp3_exo2.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/TP3/exo2/tp3_exo2.py b/TP3/exo2/tp3_exo2.py index c59b671..78392d9 100755 --- a/TP3/exo2/tp3_exo2.py +++ b/TP3/exo2/tp3_exo2.py @@ -41,7 +41,7 @@ def generateData2(n): def generateData3(n): """ - Generates a 2D linearly separable dataset with 2n samples. + Generates a 2D linearly separable dataset with about 2n samples. The third element of the sample is the label """ # (xb, yb) est dans le carré centré à l’origine de côté 1 @@ -62,7 +62,7 @@ def generateData3(n): training_set_size = 150 -training_set = generateData2(training_set_size) +training_set = generateData3(training_set_size) data = np.array(training_set) X = data[:, 0:2] Y = data[:, -1] @@ -86,14 +86,14 @@ def complete(sample): return np.array(new_sample) -def plongement(sample_element): +def plongement_phi(sample_element): return [1, sample_element[0], sample_element[1], sample_element[0] * sample_element[0], sample_element[0] * sample_element[1], sample_element[1] * sample_element[1]] -def apply_plongement(sample): +def apply_plongement(sample, p): output = [] for i in range(sample.shape[0]): - current = plongement(sample[i]) + current = p(sample[i]) output.append(current) return np.array(output) @@ -106,7 +106,11 @@ def f_from_k(coeffs, support_set, k, x): def k1(X1, X2): - return 1 + X1[0] * X2[0] + X1[1] * X2[1] + X1[0] * X1[0] * X2[0] * X2[0] + X1[0] * X1[1] * X2[0] * X1[1] + X1[1] * X2[1] * X2[1] + return 1 + X1[0] * X2[0] + X1[1] * X2[1] + X1[0] * X1[0] * X2[0] * X2[0] + X1[0] * X1[1] * X2[0] * X2[1] + X1[1] * X1[1] * X2[1] * X2[1] + + +def kg(x, y, sigma=10): + return np.exp(-((x[0] - y[0])**2 + (x[1] - y[1])**2) / sigma**2) def perceptron_k(X, Y, k): @@ -127,8 +131,9 @@ def perceptron_k(X, Y, k): print(perceptron_k(X, Y, k1)) +# print(perceptron_k(X, Y, kg)) -X = apply_plongement(X) +X = apply_plongement(X, plongement_phi) w = perceptron_nobias(X, Y) print(w) -- 2.34.1