diff --git a/lab2/assignment1.R b/lab2/assignment1.R
index 4aa116329edf8cd2c95efc509b604db844d72789..4d1c5b6963f59f8a8f1d24c11e0cbf9df5b9cb1f 100644
--- a/lab2/assignment1.R
+++ b/lab2/assignment1.R
@@ -50,16 +50,12 @@ lambda_with_k_features = function(x_train, y_train, alpha, k = 3) {
}
-lambda_with_3_features = lambda_with_k_features(x_train, y_train, 1, 3)
-
-print(lambda_with_3_features)
+lambda_with_k_features(x_train, y_train, alpha = 1, k = 3)
#----4.----
-lambda_with_3_features = lambda_with_k_features(x_train, y_train, 0, 3)
-
-print(lambda_with_3_features)
+lambda_with_k_features(x_train, y_train, alpha = 0, k = 3)
#----5.----
@@ -70,12 +66,12 @@ grid()
fit$lambda.min
-coef(fit, s = "lambda.min")
+sum(coef(fit, s = "lambda.min")[-1] != 0) # ignore intercept
-y_hat = predict(fit, newx = as.matrix(X_train), s = "lambda.min")
+y_hat = predict(fit, newx = as.matrix(X_test), s = "lambda.min")
plot(
- y_train,
+ y_test,
y_hat,
xlab = "Observed test values",
ylab = "Predicted test values",
diff --git a/lab2/figures/assignment1-5-2.eps b/lab2/figures/assignment1-5-2.eps
index 4b98ac7410fede160ab1d8eefe2c087a42372d85..031cbfc8f7bf335fee17c45d55fb8c2eaed0d4be 100644
--- a/lab2/figures/assignment1-5-2.eps
+++ b/lab2/figures/assignment1-5-2.eps
@@ -143,113 +143,114 @@ bp
1 setlinecap
1 setlinejoin
10.00 setmiterlimit
-290.78 158.58 2.70 c p1
-94.52 103.07 2.70 c p1
-260.10 137.51 2.70 c p1
-118.08 92.79 2.70 c p1
-111.65 92.19 2.70 c p1
-178.02 105.62 2.70 c p1
-126.64 87.12 2.70 c p1
-183.02 107.54 2.70 c p1
-352.16 176.20 2.70 c p1
-145.91 80.00 2.70 c p1
-268.66 144.27 2.70 c p1
-282.93 144.33 2.70 c p1
-212.99 121.95 2.70 c p1
-183.02 111.21 2.70 c p1
-208.00 122.36 2.70 c p1
-179.45 117.87 2.70 c p1
-317.19 170.40 2.70 c p1
-272.23 143.10 2.70 c p1
-187.30 113.52 2.70 c p1
-182.31 104.66 2.70 c p1
-226.55 123.40 2.70 c p1
-120.93 99.62 2.70 c p1
-72.40 79.64 2.70 c p1
-125.93 99.43 2.70 c p1
-144.48 94.31 2.70 c p1
-90.96 103.86 2.70 c p1
-265.09 161.52 2.70 c p1
-108.80 87.71 2.70 c p1
-243.68 130.81 2.70 c p1
-294.35 169.75 2.70 c p1
-103.09 94.87 2.70 c p1
-138.06 102.35 2.70 c p1
-113.08 90.05 2.70 c p1
-190.16 120.70 2.70 c p1
-317.19 170.40 2.70 c p1
-111.65 94.75 2.70 c p1
-230.12 127.89 2.70 c p1
-215.14 118.42 2.70 c p1
-155.19 89.77 2.70 c p1
-264.38 142.26 2.70 c p1
-267.95 152.63 2.70 c p1
-110.22 96.61 2.70 c p1
-75.97 83.34 2.70 c p1
-80.25 81.21 2.70 c p1
-384.99 222.33 2.70 c p1
-396.41 234.76 2.70 c p1
-256.53 140.95 2.70 c p1
-289.36 150.63 2.70 c p1
-145.19 110.57 2.70 c p1
-86.67 102.76 2.70 c p1
-117.36 91.28 2.70 c p1
-125.93 100.49 2.70 c p1
-105.94 81.52 2.70 c p1
-251.53 135.39 2.70 c p1
-310.05 172.83 2.70 c p1
-175.88 106.34 2.70 c p1
-277.94 146.75 2.70 c p1
-245.11 158.61 2.70 c p1
-260.81 137.09 2.70 c p1
-105.94 89.44 2.70 c p1
-132.35 93.10 2.70 c p1
-183.02 104.83 2.70 c p1
-111.65 92.19 2.70 c p1
-397.84 208.32 2.70 c p1
-124.50 98.50 2.70 c p1
-225.84 143.31 2.70 c p1
-165.89 102.43 2.70 c p1
-324.33 162.85 2.70 c p1
-191.58 121.81 2.70 c p1
-247.96 139.55 2.70 c p1
-192.30 115.39 2.70 c p1
-117.36 101.70 2.70 c p1
-183.73 108.77 2.70 c p1
-394.27 194.48 2.70 c p1
-91.67 94.28 2.70 c p1
-306.49 155.70 2.70 c p1
-232.98 131.67 2.70 c p1
-94.52 103.07 2.70 c p1
-370.72 182.55 2.70 c p1
-378.57 189.94 2.70 c p1
-111.65 90.14 2.70 c p1
-140.91 104.59 2.70 c p1
-394.27 194.98 2.70 c p1
-406.40 197.28 2.70 c p1
-144.48 98.16 2.70 c p1
-114.51 85.95 2.70 c p1
-108.80 91.22 2.70 c p1
-143.77 87.49 2.70 c p1
-295.78 154.22 2.70 c p1
-138.06 100.91 2.70 c p1
-115.22 87.15 2.70 c p1
-176.60 109.39 2.70 c p1
-72.40 79.64 2.70 c p1
-123.78 94.75 2.70 c p1
-204.43 116.87 2.70 c p1
-98.81 91.16 2.70 c p1
-105.94 89.99 2.70 c p1
-111.65 92.23 2.70 c p1
-110.94 89.33 2.70 c p1
-117.36 91.68 2.70 c p1
-187.30 113.52 2.70 c p1
-247.96 138.06 2.70 c p1
-130.21 89.91 2.70 c p1
-274.37 143.38 2.70 c p1
-121.64 99.37 2.70 c p1
-114.51 98.36 2.70 c p1
-192.30 110.26 2.70 c p1
+100.06 89.21 2.70 c p1
+361.02 175.25 2.70 c p1
+133.39 97.96 2.70 c p1
+199.33 120.17 2.70 c p1
+109.27 81.48 2.70 c p1
+114.24 86.41 2.70 c p1
+123.46 87.38 2.70 c p1
+130.55 102.08 2.70 c p1
+153.95 97.13 2.70 c p1
+153.95 94.65 2.70 c p1
+161.75 102.54 2.70 c p1
+161.75 102.54 2.70 c p1
+190.12 110.13 2.70 c p1
+208.55 118.34 2.70 c p1
+246.14 173.68 2.70 c p1
+268.83 141.27 2.70 c p1
+281.59 152.20 2.70 c p1
+312.09 162.22 2.70 c p1
+400.02 231.00 2.70 c p1
+402.15 234.76 2.70 c p1
+406.40 220.05 2.70 c p1
+136.22 98.56 2.70 c p1
+85.87 88.96 2.70 c p1
+94.38 81.91 2.70 c p1
+95.09 92.68 2.70 c p1
+95.09 93.37 2.70 c p1
+103.60 90.94 2.70 c p1
+105.02 88.92 2.70 c p1
+105.73 93.53 2.70 c p1
+106.44 82.28 2.70 c p1
+107.86 81.82 2.70 c p1
+112.82 94.70 2.70 c p1
+112.82 93.41 2.70 c p1
+126.29 96.63 2.70 c p1
+127.00 99.89 2.70 c p1
+127.00 100.33 2.70 c p1
+129.84 100.34 2.70 c p1
+129.84 100.89 2.70 c p1
+135.51 95.01 2.70 c p1
+136.22 97.13 2.70 c p1
+137.64 96.66 2.70 c p1
+141.19 103.62 2.70 c p1
+148.28 102.60 2.70 c p1
+156.08 87.37 2.70 c p1
+180.19 108.07 2.70 c p1
+187.28 109.11 2.70 c p1
+187.99 111.48 2.70 c p1
+191.53 118.77 2.70 c p1
+210.68 125.87 2.70 c p1
+243.30 138.12 2.70 c p1
+255.36 137.13 2.70 c p1
+257.48 138.79 2.70 c p1
+261.74 142.21 2.70 c p1
+262.45 142.36 2.70 c p1
+263.16 140.81 2.70 c p1
+273.79 139.04 2.70 c p1
+281.59 162.43 2.70 c p1
+307.12 164.23 2.70 c p1
+317.05 171.64 2.70 c p1
+326.27 177.23 2.70 c p1
+377.33 193.03 2.70 c p1
+382.29 217.98 2.70 c p1
+269.54 130.97 2.70 c p1
+100.06 89.78 2.70 c p1
+118.49 86.22 2.70 c p1
+153.95 97.13 2.70 c p1
+101.47 104.36 2.70 c p1
+91.55 87.73 2.70 c p1
+95.80 90.98 2.70 c p1
+106.44 82.28 2.70 c p1
+108.57 83.36 2.70 c p1
+113.53 99.46 2.70 c p1
+129.13 104.06 2.70 c p1
+144.73 101.94 2.70 c p1
+157.50 111.99 2.70 c p1
+191.53 114.84 2.70 c p1
+278.76 159.22 2.70 c p1
+307.83 151.61 2.70 c p1
+331.23 186.75 2.70 c p1
+133.39 91.09 2.70 c p1
+72.40 80.75 2.70 c p1
+91.55 99.38 2.70 c p1
+119.20 88.93 2.70 c p1
+137.64 79.64 2.70 c p1
+156.08 87.37 2.70 c p1
+223.44 127.24 2.70 c p1
+263.86 146.22 2.70 c p1
+304.99 173.82 2.70 c p1
+397.18 223.08 2.70 c p1
+78.78 100.65 2.70 c p1
+92.26 87.75 2.70 c p1
+97.93 88.86 2.70 c p1
+108.57 88.43 2.70 c p1
+109.98 93.36 2.70 c p1
+114.24 87.92 2.70 c p1
+123.46 87.71 2.70 c p1
+134.09 92.57 2.70 c p1
+137.64 107.34 2.70 c p1
+146.86 96.73 2.70 c p1
+159.62 95.15 2.70 c p1
+171.68 109.20 2.70 c p1
+186.57 111.89 2.70 c p1
+234.08 127.84 2.70 c p1
+265.28 140.38 2.70 c p1
+297.90 151.95 2.70 c p1
+309.96 159.66 2.70 c p1
+359.60 180.21 2.70 c p1
+397.18 223.08 2.70 c p1
0.00 0.00 450.00 300.00 cl
0 0 0 srgb
0.75 setlinewidth
@@ -258,64 +259,69 @@ bp
1 setlinejoin
10.00 setmiterlimit
np
-65.98 73.44 m
-285.47 0 l
+129.13 73.44 m
+283.65 0 l
o
np
-65.98 73.44 m
+129.13 73.44 m
0 -7.20 l
o
np
-137.34 73.44 m
+200.04 73.44 m
0 -7.20 l
o
np
-208.71 73.44 m
+270.96 73.44 m
0 -7.20 l
o
np
-280.08 73.44 m
+341.87 73.44 m
0 -7.20 l
o
np
-351.45 73.44 m
+412.78 73.44 m
0 -7.20 l
o
/Font1 findfont 12 s
-65.98 47.52 (0) .5 0 t
-137.34 47.52 (10) .5 0 t
-208.71 47.52 (20) .5 0 t
-280.08 47.52 (30) .5 0 t
-351.45 47.52 (40) .5 0 t
+129.13 47.52 (10) .5 0 t
+200.04 47.52 (20) .5 0 t
+270.96 47.52 (30) .5 0 t
+341.87 47.52 (40) .5 0 t
+412.78 47.52 (50) .5 0 t
np
-59.04 96.78 m
-0 121.17 l
+59.04 95.14 m
+0 139.84 l
o
np
-59.04 96.78 m
+59.04 95.14 m
-7.20 0 l
o
np
-59.04 127.07 m
+59.04 123.11 m
-7.20 0 l
o
np
-59.04 157.36 m
+59.04 151.07 m
-7.20 0 l
o
np
-59.04 187.65 m
+59.04 179.04 m
-7.20 0 l
o
np
-59.04 217.95 m
+59.04 207.01 m
-7.20 0 l
o
-41.76 96.78 (10) .5 90 t
-41.76 127.07 (20) .5 90 t
-41.76 157.36 (30) .5 90 t
-41.76 187.65 (40) .5 90 t
-41.76 217.95 (50) .5 90 t
+np
+59.04 234.98 m
+-7.20 0 l
+o
+41.76 95.14 (10) .5 90 t
+41.76 123.11 (20) .5 90 t
+41.76 151.07 (30) .5 90 t
+41.76 179.04 (40) .5 90 t
+41.76 207.01 (50) .5 90 t
+41.76 234.98 (60) .5 90 t
np
59.04 73.44 m
360.72 0 l
@@ -342,43 +348,47 @@ cp p1
1 setlinejoin
10.00 setmiterlimit
np
-59.04 96.78 m
+59.04 95.14 m
+360.72 0 l
+o
+np
+59.04 123.11 m
360.72 0 l
o
np
-59.04 127.07 m
+59.04 151.07 m
360.72 0 l
o
np
-59.04 157.36 m
+59.04 179.04 m
360.72 0 l
o
np
-59.04 187.65 m
+59.04 207.01 m
360.72 0 l
o
np
-59.04 217.95 m
+59.04 234.98 m
360.72 0 l
o
np
-65.98 73.44 m
+129.13 73.44 m
0 167.52 l
o
np
-137.34 73.44 m
+200.04 73.44 m
0 167.52 l
o
np
-208.71 73.44 m
+270.96 73.44 m
0 167.52 l
o
np
-280.08 73.44 m
+341.87 73.44 m
0 167.52 l
o
np
-351.45 73.44 m
+412.78 73.44 m
0 167.52 l
o
ep
diff --git a/lab2/figures/assignment1-5-2.png b/lab2/figures/assignment1-5-2.png
index 4dd5645222b3a92f449aaaed5523b2a8d7d90c0f..7e1c08eaf689e69040690e98bac41abeb27a12db 100644
Binary files a/lab2/figures/assignment1-5-2.png and b/lab2/figures/assignment1-5-2.png differ