diff --git a/doc/pub/week38/html/._week38-bs014.html b/doc/pub/week38/html/._week38-bs014.html index 8290e2bb1..4c330102a 100644 --- a/doc/pub/week38/html/._week38-bs014.html +++ b/doc/pub/week38/html/._week38-bs014.html @@ -460,11 +460,11 @@ X = np.z beta = fit_beta(X, y) # Intercept is included in the design matrix -clf = LinearRegression(fit_intercept=False).fit(X, y) +skl = LinearRegression(fit_intercept=False).fit(X, y) print(f"True beta: {true_beta}") print(f"Fitted beta: {beta}") -print(f"Sklearn fitted beta: {clf.coef_}") +print(f"Sklearn fitted beta: {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with intercept column") @@ -476,7 +476,7 @@ ypredictSKL = skl.figure() plt.scatter(x, y, label="Data") plt.plot(x, X @ beta, label="Fit") -plt.plot(x, clf.predict(X), label="Sklearn (fit_intercept=False)") +plt.plot(x, skl.predict(X), label="Sklearn (fit_intercept=False)") # Do not include the intercept in the design matrix @@ -486,7 +486,7 @@ X = np.z X[:, p] = x ** (p + 1) # Intercept is not included in the design matrix -clf = LinearRegression(fit_intercept=True).fit(X, y) +skl = LinearRegression(fit_intercept=True).fit(X, y) # Use centered values for X and y when computing coefficients y_offset = np.average(y, axis=0) @@ -497,8 +497,8 @@ intercept = np. print(f"Manual intercept: {intercept}") print(f"Fitted beta (wiothout intercept): {beta}") -print(f"Sklearn intercept: {clf.intercept_}") -print(f"Sklearn fitted beta (without intercept): {clf.coef_}") +print(f"Sklearn intercept: {skl.intercept_}") +print(f"Sklearn fitted beta (without intercept): {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with Manual intercept") @@ -507,7 +507,7 @@ ypredictSKL = sklprint(MSE(y,ypredictSKL)) plt.plot(x, X @ beta + intercept, "--", label="Fit (manual intercept)") -plt.plot(x, clf.predict(X), "--", label="Sklearn (fit_intercept=True)") +plt.plot(x, skl.predict(X), "--", label="Sklearn (fit_intercept=True)") plt.grid() plt.legend() diff --git a/doc/pub/week38/html/week38-reveal.html b/doc/pub/week38/html/week38-reveal.html index 22973f249..9e09c6fa9 100644 --- a/doc/pub/week38/html/week38-reveal.html +++ b/doc/pub/week38/html/week38-reveal.html @@ -713,11 +713,11 @@ X = np.zeros((len(x), degree)) beta = fit_beta(X, y) # Intercept is included in the design matrix -clf = LinearRegression(fit_intercept=False).fit(X, y) +skl = LinearRegression(fit_intercept=False).fit(X, y) print(f"True beta: {true_beta}") print(f"Fitted beta: {beta}") -print(f"Sklearn fitted beta: {clf.coef_}") +print(f"Sklearn fitted beta: {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with intercept column") @@ -729,7 +729,7 @@ ypredictSKL = skl.predict(X) plt.figure() plt.scatter(x, y, label="Data") plt.plot(x, X @ beta, label="Fit") -plt.plot(x, clf.predict(X), label="Sklearn (fit_intercept=False)") +plt.plot(x, skl.predict(X), label="Sklearn (fit_intercept=False)") # Do not include the intercept in the design matrix @@ -739,7 +739,7 @@ X = np.zeros((len(x), degree - 1) # Intercept is not included in the design matrix -clf = LinearRegression(fit_intercept=True).fit(X, y) +skl = LinearRegression(fit_intercept=True).fit(X, y) # Use centered values for X and y when computing coefficients y_offset = np.average(y, axis=0) @@ -750,8 +750,8 @@ intercept = np.mean(y_offset - X_offset @ beta) print(f"Manual intercept: {intercept}") print(f"Fitted beta (wiothout intercept): {beta}") -print(f"Sklearn intercept: {clf.intercept_}") -print(f"Sklearn fitted beta (without intercept): {clf.coef_}") +print(f"Sklearn intercept: {skl.intercept_}") +print(f"Sklearn fitted beta (without intercept): {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with Manual intercept") @@ -760,7 +760,7 @@ ypredictSKL = skl.predict(X) print(MSE(y,ypredictSKL)) plt.plot(x, X @ beta + intercept, "--", label="Fit (manual intercept)") -plt.plot(x, clf.predict(X), "--", label="Sklearn (fit_intercept=True)") +plt.plot(x, skl.predict(X), "--", label="Sklearn (fit_intercept=True)") plt.grid() plt.legend() diff --git a/doc/pub/week38/html/week38-solarized.html b/doc/pub/week38/html/week38-solarized.html index da89caf98..d4666dff6 100644 --- a/doc/pub/week38/html/week38-solarized.html +++ b/doc/pub/week38/html/week38-solarized.html @@ -847,11 +847,11 @@ X = np.zeros((len(x), degree)) beta = fit_beta(X, y) # Intercept is included in the design matrix -clf = LinearRegression(fit_intercept=False).fit(X, y) +skl = LinearRegression(fit_intercept=False).fit(X, y) print(f"True beta: {true_beta}") print(f"Fitted beta: {beta}") -print(f"Sklearn fitted beta: {clf.coef_}") +print(f"Sklearn fitted beta: {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with intercept column") @@ -863,7 +863,7 @@ ypredictSKL = skl.predict(X) plt.figure() plt.scatter(x, y, label="Data") plt.plot(x, X @ beta, label="Fit") -plt.plot(x, clf.predict(X), label="Sklearn (fit_intercept=False)") +plt.plot(x, skl.predict(X), label="Sklearn (fit_intercept=False)") # Do not include the intercept in the design matrix @@ -873,7 +873,7 @@ X = np.zeros((len(x), degree - 1) # Intercept is not included in the design matrix -clf = LinearRegression(fit_intercept=True).fit(X, y) +skl = LinearRegression(fit_intercept=True).fit(X, y) # Use centered values for X and y when computing coefficients y_offset = np.average(y, axis=0) @@ -884,8 +884,8 @@ intercept = np.mean(y_offset - X_offset @ beta) print(f"Manual intercept: {intercept}") print(f"Fitted beta (wiothout intercept): {beta}") -print(f"Sklearn intercept: {clf.intercept_}") -print(f"Sklearn fitted beta (without intercept): {clf.coef_}") +print(f"Sklearn intercept: {skl.intercept_}") +print(f"Sklearn fitted beta (without intercept): {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with Manual intercept") @@ -894,7 +894,7 @@ ypredictSKL = skl.predict(X) print(MSE(y,ypredictSKL)) plt.plot(x, X @ beta + intercept, "--", label="Fit (manual intercept)") -plt.plot(x, clf.predict(X), "--", label="Sklearn (fit_intercept=True)") +plt.plot(x, skl.predict(X), "--", label="Sklearn (fit_intercept=True)") plt.grid() plt.legend() diff --git a/doc/pub/week38/html/week38.html b/doc/pub/week38/html/week38.html index d467ae5e5..ec13a9371 100644 --- a/doc/pub/week38/html/week38.html +++ b/doc/pub/week38/html/week38.html @@ -852,11 +852,11 @@ X = np.z beta = fit_beta(X, y) # Intercept is included in the design matrix -clf = LinearRegression(fit_intercept=False).fit(X, y) +skl = LinearRegression(fit_intercept=False).fit(X, y) print(f"True beta: {true_beta}") print(f"Fitted beta: {beta}") -print(f"Sklearn fitted beta: {clf.coef_}") +print(f"Sklearn fitted beta: {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with intercept column") @@ -868,7 +868,7 @@ ypredictSKL = skl.figure() plt.scatter(x, y, label="Data") plt.plot(x, X @ beta, label="Fit") -plt.plot(x, clf.predict(X), label="Sklearn (fit_intercept=False)") +plt.plot(x, skl.predict(X), label="Sklearn (fit_intercept=False)") # Do not include the intercept in the design matrix @@ -878,7 +878,7 @@ X = np.z X[:, p] = x ** (p + 1) # Intercept is not included in the design matrix -clf = LinearRegression(fit_intercept=True).fit(X, y) +skl = LinearRegression(fit_intercept=True).fit(X, y) # Use centered values for X and y when computing coefficients y_offset = np.average(y, axis=0) @@ -889,8 +889,8 @@ intercept = np. print(f"Manual intercept: {intercept}") print(f"Fitted beta (wiothout intercept): {beta}") -print(f"Sklearn intercept: {clf.intercept_}") -print(f"Sklearn fitted beta (without intercept): {clf.coef_}") +print(f"Sklearn intercept: {skl.intercept_}") +print(f"Sklearn fitted beta (without intercept): {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with Manual intercept") @@ -899,7 +899,7 @@ ypredictSKL = sklprint(MSE(y,ypredictSKL)) plt.plot(x, X @ beta + intercept, "--", label="Fit (manual intercept)") -plt.plot(x, clf.predict(X), "--", label="Sklearn (fit_intercept=True)") +plt.plot(x, skl.predict(X), "--", label="Sklearn (fit_intercept=True)") plt.grid() plt.legend() diff --git a/doc/pub/week38/ipynb/ipynb-week38-src.tar.gz b/doc/pub/week38/ipynb/ipynb-week38-src.tar.gz index 1deffa1e8..a57f336d8 100644 Binary files a/doc/pub/week38/ipynb/ipynb-week38-src.tar.gz and b/doc/pub/week38/ipynb/ipynb-week38-src.tar.gz differ diff --git a/doc/pub/week38/ipynb/week38.ipynb b/doc/pub/week38/ipynb/week38.ipynb index e70fc369c..51f9a0764 100644 --- a/doc/pub/week38/ipynb/week38.ipynb +++ b/doc/pub/week38/ipynb/week38.ipynb @@ -776,11 +776,11 @@ "beta = fit_beta(X, y)\n", "\n", "# Intercept is included in the design matrix\n", - "clf = LinearRegression(fit_intercept=False).fit(X, y)\n", + "skl = LinearRegression(fit_intercept=False).fit(X, y)\n", "\n", "print(f\"True beta: {true_beta}\")\n", "print(f\"Fitted beta: {beta}\")\n", - "print(f\"Sklearn fitted beta: {clf.coef_}\")\n", + "print(f\"Sklearn fitted beta: {skl.coef_}\")\n", "ypredictOwn = X @ beta\n", "ypredictSKL = skl.predict(X)\n", "print(f\"MSE with intercept column\")\n", @@ -792,7 +792,7 @@ "plt.figure()\n", "plt.scatter(x, y, label=\"Data\")\n", "plt.plot(x, X @ beta, label=\"Fit\")\n", - "plt.plot(x, clf.predict(X), label=\"Sklearn (fit_intercept=False)\")\n", + "plt.plot(x, skl.predict(X), label=\"Sklearn (fit_intercept=False)\")\n", "\n", "\n", "# Do not include the intercept in the design matrix\n", @@ -802,7 +802,7 @@ " X[:, p] = x ** (p + 1)\n", "\n", "# Intercept is not included in the design matrix\n", - "clf = LinearRegression(fit_intercept=True).fit(X, y)\n", + "skl = LinearRegression(fit_intercept=True).fit(X, y)\n", "\n", "# Use centered values for X and y when computing coefficients\n", "y_offset = np.average(y, axis=0)\n", @@ -813,8 +813,8 @@ "\n", "print(f\"Manual intercept: {intercept}\")\n", "print(f\"Fitted beta (wiothout intercept): {beta}\")\n", - "print(f\"Sklearn intercept: {clf.intercept_}\")\n", - "print(f\"Sklearn fitted beta (without intercept): {clf.coef_}\")\n", + "print(f\"Sklearn intercept: {skl.intercept_}\")\n", + "print(f\"Sklearn fitted beta (without intercept): {skl.coef_}\")\n", "ypredictOwn = X @ beta\n", "ypredictSKL = skl.predict(X)\n", "print(f\"MSE with Manual intercept\")\n", @@ -823,7 +823,7 @@ "print(MSE(y,ypredictSKL))\n", "\n", "plt.plot(x, X @ beta + intercept, \"--\", label=\"Fit (manual intercept)\")\n", - "plt.plot(x, clf.predict(X), \"--\", label=\"Sklearn (fit_intercept=True)\")\n", + "plt.plot(x, skl.predict(X), \"--\", label=\"Sklearn (fit_intercept=True)\")\n", "plt.grid()\n", "plt.legend()\n", "\n", diff --git a/doc/src/week38/week38.do.txt b/doc/src/week38/week38.do.txt index 658aea36a..31ed19ca7 100644 --- a/doc/src/week38/week38.do.txt +++ b/doc/src/week38/week38.do.txt @@ -492,11 +492,11 @@ for p in range(degree): beta = fit_beta(X, y) # Intercept is included in the design matrix -clf = LinearRegression(fit_intercept=False).fit(X, y) +skl = LinearRegression(fit_intercept=False).fit(X, y) print(f"True beta: {true_beta}") print(f"Fitted beta: {beta}") -print(f"Sklearn fitted beta: {clf.coef_}") +print(f"Sklearn fitted beta: {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with intercept column") @@ -508,7 +508,7 @@ print(MSE(y,ypredictSKL)) plt.figure() plt.scatter(x, y, label="Data") plt.plot(x, X @ beta, label="Fit") -plt.plot(x, clf.predict(X), label="Sklearn (fit_intercept=False)") +plt.plot(x, skl.predict(X), label="Sklearn (fit_intercept=False)") # Do not include the intercept in the design matrix @@ -518,7 +518,7 @@ for p in range(degree - 1): X[:, p] = x ** (p + 1) # Intercept is not included in the design matrix -clf = LinearRegression(fit_intercept=True).fit(X, y) +skl = LinearRegression(fit_intercept=True).fit(X, y) # Use centered values for X and y when computing coefficients y_offset = np.average(y, axis=0) @@ -529,8 +529,8 @@ intercept = np.mean(y_offset - X_offset @ beta) print(f"Manual intercept: {intercept}") print(f"Fitted beta (wiothout intercept): {beta}") -print(f"Sklearn intercept: {clf.intercept_}") -print(f"Sklearn fitted beta (without intercept): {clf.coef_}") +print(f"Sklearn intercept: {skl.intercept_}") +print(f"Sklearn fitted beta (without intercept): {skl.coef_}") ypredictOwn = X @ beta ypredictSKL = skl.predict(X) print(f"MSE with Manual intercept") @@ -539,7 +539,7 @@ print(f"MSE with Sklearn intercept") print(MSE(y,ypredictSKL)) plt.plot(x, X @ beta + intercept, "--", label="Fit (manual intercept)") -plt.plot(x, clf.predict(X), "--", label="Sklearn (fit_intercept=True)") +plt.plot(x, skl.predict(X), "--", label="Sklearn (fit_intercept=True)") plt.grid() plt.legend()