-
-
Notifications
You must be signed in to change notification settings - Fork 46.6k
Modified Linear Regression to work on OLS, fixes #8847 #11311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5de5b80
added bipolar binary function
smruthi-sumanth 9bd4765
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 95398e0
Merge branch 'TheAlgorithms:master' into master
smruthi-sumanth 1486a54
modified linear regression to work on OLS
smruthi-sumanth 6a8adc9
Delete neural_network/activation_functions/bipolar_binary_step.py
smruthi-sumanth 29fb882
Update machine_learning/linear_regression.py
smruthi-sumanth 1629c4c
Update machine_learning/linear_regression.py
smruthi-sumanth File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,85 +31,32 @@ | |
return dataset | ||
|
||
|
||
def run_steep_gradient_descent(data_x, data_y, len_data, alpha, theta): | ||
"""Run steep gradient descent and updates the Feature vector accordingly_ | ||
:param data_x : contains the dataset | ||
:param data_y : contains the output associated with each data-entry | ||
:param len_data : length of the data_ | ||
:param alpha : Learning rate of the model | ||
:param theta : Feature vector (weight's for our model) | ||
;param return : Updated Feature's, using | ||
curr_features - alpha_ * gradient(w.r.t. feature) | ||
""" | ||
n = len_data | ||
|
||
prod = np.dot(theta, data_x.transpose()) | ||
prod -= data_y.transpose() | ||
sum_grad = np.dot(prod, data_x) | ||
theta = theta - (alpha / n) * sum_grad | ||
return theta | ||
|
||
|
||
def sum_of_square_error(data_x, data_y, len_data, theta): | ||
"""Return sum of square error for error calculation | ||
:param data_x : contains our dataset | ||
:param data_y : contains the output (result vector) | ||
:param len_data : len of the dataset | ||
:param theta : contains the feature vector | ||
:return : sum of square error computed from given feature's | ||
""" | ||
prod = np.dot(theta, data_x.transpose()) | ||
prod -= data_y.transpose() | ||
sum_elem = np.sum(np.square(prod)) | ||
error = sum_elem / (2 * len_data) | ||
return error | ||
|
||
|
||
def run_linear_regression(data_x, data_y): | ||
"""Implement Linear regression over the dataset | ||
:param data_x : contains our dataset | ||
:param data_y : contains the output (result vector) | ||
def ols_linear_regression(data_x: np.ndarray, data_y: np.ndarray) -> np.ndarray: | ||
"""Implement Linear regression using OLS over the dataset | ||
:param data_x : contains our dataset | ||
:param data_y : contains the output (result vector) | ||
:return : feature for line of best fit (Feature vector) | ||
""" | ||
Comment on lines
38
to
39
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The OLS regression function needs doctests—make sure you verify the outputs of your tests with a calculator that can do linear regression (e.g., Wolfram Alpha) |
||
iterations = 100000 | ||
alpha = 0.0001550 | ||
|
||
no_features = data_x.shape[1] | ||
len_data = data_x.shape[0] - 1 | ||
# Add a column of ones to data_x for the bias term | ||
data_x = np.c_[np.ones(data_x.shape[0]), data_x].astype(float) | ||
|
||
theta = np.zeros((1, no_features)) | ||
|
||
for i in range(iterations): | ||
theta = run_steep_gradient_descent(data_x, data_y, len_data, alpha, theta) | ||
error = sum_of_square_error(data_x, data_y, len_data, theta) | ||
print(f"At Iteration {i + 1} - Error is {error:.5f}") | ||
# Use NumPy's built-in function to solve the linear regression problem | ||
theta = np.linalg.inv(data_x.T @ data_x) @ data_x.T @ data_y | ||
|
||
return theta | ||
|
||
|
||
def mean_absolute_error(predicted_y, original_y): | ||
"""Return sum of square error for error calculation | ||
:param predicted_y : contains the output of prediction (result vector) | ||
:param original_y : contains values of expected outcome | ||
:return : mean absolute error computed from given feature's | ||
""" | ||
total = sum(abs(y - predicted_y[i]) for i, y in enumerate(original_y)) | ||
return total / len(original_y) | ||
|
||
|
||
def main(): | ||
"""Driver function""" | ||
data = collect_dataset() | ||
|
||
len_data = data.shape[0] | ||
data_x = np.c_[np.ones(len_data), data[:, :-1]].astype(float) | ||
data_x = data[:, :-1].astype(float) | ||
data_y = data[:, -1].astype(float) | ||
|
||
theta = run_linear_regression(data_x, data_y) | ||
len_result = theta.shape[1] | ||
print("Resultant Feature vector : ") | ||
for i in range(len_result): | ||
print(f"{theta[0, i]:.5f}") | ||
theta = run_linear_regression_ols(data_x, data_y) | ||
print("Resultant Feature vector (weights): ") | ||
theta_list = theta.tolist()[0] | ||
for i in range(len(theta_list)): | ||
print(f"{theta_list[i]:.5f}") | ||
|
||
|
||
if __name__ == "__main__": | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Slight rewording for clarity