Update GD_regression

erikasan · Nov 18, 2020 · 1689131 · 1689131
1 parent 041754b
commit 1689131
Show file tree

Hide file tree

Showing 30 changed files with 1,619 additions and 1,761 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.ipynb_checkpoints/GD_Regression-checkpoint.ipynb b/.ipynb_checkpoints/GD_Regression-checkpoint.ipynb
diff --git a/Figures/Algorithms.pdf b/Figures/Algorithms.pdf
diff --git a/Figures/OLS_MSE_epochs.pdf b/Figures/OLS_MSE_epochs.pdf
diff --git a/Figures/OLS_MSE_epochs_lr.pdf b/Figures/OLS_MSE_epochs_lr.pdf
diff --git a/Figures/OLS_MSE_epochs_lrs.pdf b/Figures/OLS_MSE_epochs_lrs.pdf
diff --git a/Figures/OLS_MSE_epochs_momentum.pdf b/Figures/OLS_MSE_epochs_momentum.pdf
diff --git a/Figures/OLS_MSE_epochs_particular_batch_size.pdf b/Figures/OLS_MSE_epochs_particular_batch_size.pdf
diff --git a/Figures/OLS_MSE_epochs_particular_gamma.pdf b/Figures/OLS_MSE_epochs_particular_gamma.pdf
diff --git a/Figures/OLS_MSE_epochs_particular_lambda.pdf b/Figures/OLS_MSE_epochs_particular_lambda.pdf
diff --git a/Figures/OLS_MSE_epochs_particular_momentum.pdf b/Figures/OLS_MSE_epochs_particular_momentum.pdf
diff --git a/Figures/OLS_MSE_epochs_various_lr.pdf b/Figures/OLS_MSE_epochs_various_lr.pdf
diff --git a/Figures/OLS_MSE_lrs_momentum_epochs_75.pdf b/Figures/OLS_MSE_lrs_momentum_epochs_75.pdf
diff --git a/Figures/OLS_MSE_lrs_with_momentum_epochs_250.pdf b/Figures/OLS_MSE_lrs_with_momentum_epochs_250.pdf
diff --git a/Figures/OLS_MSE_lrs_with_momentum_epochs_75.pdf b/Figures/OLS_MSE_lrs_with_momentum_epochs_75.pdf
diff --git a/Figures/OLS_MSE_lrs_without_momentum_epochs_250.pdf b/Figures/OLS_MSE_lrs_without_momentum_epochs_250.pdf
diff --git a/Figures/OLS_MSE_lrs_without_momentum_epochs_75.pdf b/Figures/OLS_MSE_lrs_without_momentum_epochs_75.pdf
diff --git a/Figures/OLS_MSE_mini_b_momentum.pdf b/Figures/OLS_MSE_mini_b_momentum.pdf
diff --git a/Figures/Ridge_MSE_epochs_overview.pdf b/Figures/Ridge_MSE_epochs_overview.pdf
diff --git a/Figures/Ridge_MSE_epochs_particular_lambda.pdf b/Figures/Ridge_MSE_epochs_particular_lambda.pdf
diff --git a/Figures/Ridge_MSE_epochs_various_lr.pdf b/Figures/Ridge_MSE_epochs_various_lr.pdf
diff --git a/programs/.ipynb_checkpoints/GD_Regression-checkpoint.ipynb b/programs/.ipynb_checkpoints/GD_Regression-checkpoint.ipynb
diff --git a/programs/GD_Regression.ipynb b/programs/GD_Regression.ipynb
diff --git a/programs/__init__.py b/programs/__init__.py
diff --git a/programs/mylearn/__pycache__/__init__.cpython-38.pyc b/programs/mylearn/__pycache__/__init__.cpython-38.pyc
diff --git a/programs/mylearn/__pycache__/linear_model.cpython-38.pyc b/programs/mylearn/__pycache__/linear_model.cpython-38.pyc
diff --git a/programs/mylearn/__pycache__/ml_tools.cpython-38.pyc b/programs/mylearn/__pycache__/ml_tools.cpython-38.pyc
diff --git a/programs/mylearn/__pycache__/project_tools.cpython-38.pyc b/programs/mylearn/__pycache__/project_tools.cpython-38.pyc
diff --git a/programs/mylearn/linear_model.py b/programs/mylearn/linear_model.py
@@ -235,7 +235,7 @@ def __init__(self, lmbda=0, eta=0.01, t0=5, t1=50, gamma=0.9,
         self._batch_size = batch_size
         self._fit_intercept = fit_intercept
 
-    def fit(self, X, y, weights="uniform", method="BGD"):
+    def fit(self, X, y, weights="uniform", seed_val=None, method="BGD"):
         """
         Fit the model
         ----------
@@ -245,6 +245,9 @@ def fit(self, X, y, weights="uniform", method="BGD"):
         self.target = y
         self._method = method
 
+        if seed_val is not None:
+            np.random.seed(seed_val)
+
         # check if X is 1D or 2D array
         if len(self.data.shape) == 1:  # find shape of array
             # reshape takes all data with [-1] and makes it 2D

diff --git a/programs/mylearn/project_tools.py b/programs/mylearn/project_tools.py
@@ -4,7 +4,7 @@
 import os
 
 # Set path to save the figures and data files
-FIGURE_PATH = "./Figures"
+FIGURE_PATH = "../Figures"
 
 
 def fig_path(fig_id):