Sourcery refactored master branch#1
Open
sourcery-ai[bot] wants to merge 1 commit intomasteredson-github/Machine-Learning-with-Python:masterfrom
sourcery/masteredson-github/Machine-Learning-with-Python:sourcery/masterCopy head branch name to clipboard
Open
Sourcery refactored master branch#1sourcery-ai[bot] wants to merge 1 commit intomasteredson-github/Machine-Learning-with-Python:masterfrom sourcery/masteredson-github/Machine-Learning-with-Python:sourcery/masterCopy head branch name to clipboard
sourcery-ai[bot] wants to merge 1 commit intomasteredson-github/Machine-Learning-with-Python:masterfrom
sourcery/masteredson-github/Machine-Learning-with-Python:sourcery/masterCopy head branch name to clipboard
Conversation
Comment on lines
-30
to
+36
|
|
||
| x=resp.json() | ||
| j = json.loads(x) | ||
| d = dict(j) | ||
|
|
||
| for k,v in (d.items()): | ||
| print("{}: {}".format(k,round(v,2))) | ||
| print(f"{k}: {round(v, 2)}") |
Author
There was a problem hiding this comment.
Lines 30-36 refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-24
to
+41
| clf = 'lm_model_v1.pk' | ||
|
|
||
| if test.empty: | ||
| return(bad_request()) | ||
| else: | ||
| #Load the saved model | ||
| print("Loading the model...") | ||
| loaded_model = None | ||
| with open('./models/'+clf,'rb') as f: | ||
| loaded_model = pickle.load(f) | ||
|
|
||
| print("The model has been loaded...doing predictions now...") | ||
| print() | ||
| predictions = loaded_model.predict(test) | ||
|
|
||
| prediction_series = pd.Series(predictions) | ||
| response = jsonify(prediction_series.to_json()) | ||
| response.status_code = 200 | ||
| return (response) | ||
| #Load the saved model | ||
| print("Loading the model...") | ||
| loaded_model = None | ||
| clf = 'lm_model_v1.pk' | ||
|
|
||
| with open(f'./models/{clf}', 'rb') as f: | ||
| loaded_model = pickle.load(f) | ||
|
|
||
| print("The model has been loaded...doing predictions now...") | ||
| print() | ||
| predictions = loaded_model.predict(test) | ||
|
|
||
| prediction_series = pd.Series(predictions) | ||
| response = jsonify(prediction_series.to_json()) | ||
| response.status_code = 200 | ||
| return (response) |
Author
There was a problem hiding this comment.
Function apicall refactored with the following changes:
- Move assignments closer to their usage (
move-assign) - Remove unnecessary else after guard condition (
remove-unnecessary-else) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| import pandas as pd | ||
|
|
||
| import os | ||
| import os |
Author
There was a problem hiding this comment.
Lines 4-97 refactored with the following changes:
- Use f-string instead of string concatenation [×5] (
use-fstring-for-concatenation) - Replace call to format with f-string (
use-fstring-for-formatting) - Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] [×2] (
remove-redundant-slice-index) - Hoist nested repeated code outside conditional statements (
hoist-similar-statement-from-if)
| # Keep adding new words | ||
| for i in range(new_words): | ||
|
|
||
| for _ in range(new_words): |
Author
There was a problem hiding this comment.
Function generate_random_start refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore) - Convert for loop into list comprehension [×2] (
list-comprehension) - Inline variable that is immediately returned (
inline-immediately-returned-variable) - Use f-string instead of string concatenation [×6] (
use-fstring-for-concatenation)
This removes the following comments ( why? ):
#return f"<div>{seed_html}</div><div>{gen_html}</div><div>{a_html}</div>"
# Showing generated and actual abstract
Comment on lines
-99
to
+87
| word_idx = json.load(open('data/word-index.json')) | ||
| word_idx = json.load(open('data/word-index.json')) |
Author
There was a problem hiding this comment.
Function generate_from_seed refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable) - Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Comment on lines
-56
to
+49
| for i in range(len(y)): | ||
| for _ in range(len(y)): |
Author
There was a problem hiding this comment.
Function flip refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore)
Comment on lines
-82
to
+102
| if m==None: | ||
|
|
||
| if m is None: | ||
| m='' | ||
| for i in range(1,n_features+1): | ||
| c='x'+str(i) | ||
| c = f'x{str(i)}' | ||
| c+=np.random.choice(['+','-'],p=[0.5,0.5]) | ||
| m+=c | ||
| m=m[:-1] | ||
| sym_m=sympify(m) | ||
| n_features=len(sym_m.atoms(Symbol)) | ||
| evals=[] | ||
| lst_features=[] | ||
| for i in range(n_features): | ||
| lst_features.append(np.random.normal(scale=5,size=n_samples)) | ||
| lst_features = [ | ||
| np.random.normal(scale=5, size=n_samples) for _ in range(n_features) | ||
| ] | ||
| lst_features=np.array(lst_features) | ||
| lst_features=lst_features.T | ||
| for i in range(n_samples): | ||
| evals.append(eval_multinomial(m,vals=list(lst_features[i]))) | ||
|
|
||
| evals = [ | ||
| eval_multinomial(m, vals=list(lst_features[i])) | ||
| for i in range(n_samples) | ||
| ] | ||
| evals=np.array(evals) | ||
| evals_binary=evals>0 | ||
| evals_binary=evals_binary.flatten() | ||
| evals_binary=np.array(evals_binary,dtype=int) | ||
| evals_binary=flip(evals_binary,p=flip_y) | ||
| evals_binary=evals_binary.reshape(n_samples,1) | ||
|
|
||
| lst_features=lst_features.reshape(n_samples,n_features) | ||
| x=np.hstack((lst_features,evals_binary)) | ||
|
|
||
| return (x) | ||
| return np.hstack((lst_features,evals_binary)) |
Author
There was a problem hiding this comment.
Function gen_classification_symbolic refactored with the following changes:
- Use x is None rather than x == None (
none-compare) - Convert for loop into list comprehension [×2] (
list-comprehension) - Replace unused for index with underscore (
for-index-underscore) - Inline variable that is immediately returned (
inline-immediately-returned-variable) - Move assignment closer to its usage within a block (
move-assign-in-block) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-134
to
+149
| if m==None: | ||
|
|
||
| if m is None: | ||
| m='' | ||
| for i in range(1,n_features+1): | ||
| c='x'+str(i) | ||
| c = f'x{str(i)}' | ||
| c+=np.random.choice(['+','-'],p=[0.5,0.5]) | ||
| m+=c | ||
| m=m[:-1] | ||
|
|
||
| sym_m=sympify(m) | ||
| n_features=len(sym_m.atoms(Symbol)) | ||
| evals=[] | ||
| lst_features=[] | ||
|
|
||
| for i in range(n_features): | ||
| lst_features.append(np.random.normal(scale=5,size=n_samples)) | ||
| lst_features = [ | ||
| np.random.normal(scale=5, size=n_samples) for _ in range(n_features) | ||
| ] | ||
| lst_features=np.array(lst_features) | ||
| lst_features=lst_features.T | ||
| lst_features=lst_features.reshape(n_samples,n_features) | ||
|
|
||
| for i in range(n_samples): | ||
| evals.append(eval_multinomial(m,vals=list(lst_features[i]))) | ||
|
|
||
|
|
||
| evals = [ | ||
| eval_multinomial(m, vals=list(lst_features[i])) | ||
| for i in range(n_samples) | ||
| ] | ||
| evals=np.array(evals) | ||
| evals=evals.reshape(n_samples,1) | ||
|
|
Author
There was a problem hiding this comment.
Function gen_regression_symbolic refactored with the following changes:
- Use x is None rather than x == None (
none-compare) - Convert for loop into list comprehension [×2] (
list-comprehension) - Replace unused for index with underscore (
for-index-underscore) - Inline variable that is immediately returned (
inline-immediately-returned-variable) - Move assignment closer to its usage within a block (
move-assign-in-block) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-280
to
+283
| df = pd.DataFrame(np.random.normal(loc=5, | ||
| scale=5, size=50).reshape(10, 5), | ||
| columns = ['A'+ str(i) for i in range(1, 6)]) | ||
| df = pd.DataFrame( | ||
| np.random.normal(loc=5, scale=5, size=50).reshape(10, 5), | ||
| columns=[f'A{str(i)}' for i in range(1, 6)], | ||
| ) |
Author
There was a problem hiding this comment.
Lines 280-317 refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Simplify comparison to string length [×2] (
simplify-str-len-comparison)
| ``` | ||
| x = st.slider('x', -8, 8) | ||
| """ | ||
|
|
Author
There was a problem hiding this comment.
Lines 414-414 refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| s3=sympify(s2) | ||
|
|
||
| return(s3) | ||
| return sympify(s2) |
Author
There was a problem hiding this comment.
Function symbolize refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-22
to
+20
| sym_lst=[] | ||
| for s in sym_set: | ||
| sym_lst.append(str(s)) | ||
| sym_lst = [str(s) for s in sym_set] |
Author
There was a problem hiding this comment.
Function eval_multinomial refactored with the following changes:
- Convert for loop into list comprehension [×2] (
list-comprehension) - Remove an unnecessary list construction call prior to sorting (
skip-sorted-list-construction)
Comment on lines
-50
to
+43
| for i in range(len(y)): | ||
| for _ in range(len(y)): |
Author
There was a problem hiding this comment.
Function flip refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore)
Comment on lines
-72
to
+91
| if m==None: | ||
| if m is None: | ||
| m='' | ||
| for i in range(1,n_features+1): | ||
| c='x'+str(i) | ||
| c = f'x{str(i)}' | ||
| c+=np.random.choice(['+','-'],p=[0.5,0.5]) | ||
| m+=c | ||
| m=m[:-1] | ||
| sym_m=sympify(m) | ||
| n_features=len(sym_m.atoms(Symbol)) | ||
| evals=[] | ||
| lst_features=[] | ||
| for i in range(n_features): | ||
| lst_features.append(np.random.normal(scale=5,size=n_samples)) | ||
| lst_features = [ | ||
| np.random.normal(scale=5, size=n_samples) for _ in range(n_features) | ||
| ] | ||
| lst_features=np.array(lst_features) | ||
| lst_features=lst_features.T | ||
| for i in range(n_samples): | ||
| evals.append(eval_multinomial(m,vals=list(lst_features[i]))) | ||
|
|
||
| evals = [ | ||
| eval_multinomial(m, vals=list(lst_features[i])) | ||
| for i in range(n_samples) | ||
| ] | ||
| evals=np.array(evals) | ||
| evals_binary=evals>0 | ||
| evals_binary=evals_binary.flatten() | ||
| evals_binary=np.array(evals_binary,dtype=int) | ||
| evals_binary=flip(evals_binary,p=flip_y) | ||
| evals_binary=evals_binary.reshape(n_samples,1) | ||
|
|
||
| lst_features=lst_features.reshape(n_samples,n_features) | ||
| x=np.hstack((lst_features,evals_binary)) | ||
|
|
||
| return (x) | ||
| return np.hstack((lst_features,evals_binary)) |
Author
There was a problem hiding this comment.
Function gen_classification_symbolic refactored with the following changes:
- Use x is None rather than x == None (
none-compare) - Convert for loop into list comprehension [×2] (
list-comprehension) - Replace unused for index with underscore (
for-index-underscore) - Inline variable that is immediately returned (
inline-immediately-returned-variable) - Move assignment closer to its usage within a block (
move-assign-in-block) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-119
to
+133
| if m==None: | ||
| if m is None: | ||
| m='' | ||
| for i in range(1,n_features+1): | ||
| c='x'+str(i) | ||
| c = f'x{str(i)}' | ||
| c+=np.random.choice(['+','-'],p=[0.5,0.5]) | ||
| m+=c | ||
| m=m[:-1] | ||
|
|
||
| sym_m=sympify(m) | ||
| n_features=len(sym_m.atoms(Symbol)) | ||
| evals=[] | ||
| lst_features=[] | ||
|
|
||
| for i in range(n_features): | ||
| lst_features.append(np.random.normal(scale=5,size=n_samples)) | ||
| lst_features = [ | ||
| np.random.normal(scale=5, size=n_samples) for _ in range(n_features) | ||
| ] | ||
| lst_features=np.array(lst_features) | ||
| lst_features=lst_features.T | ||
| lst_features=lst_features.reshape(n_samples,n_features) | ||
|
|
||
| for i in range(n_samples): | ||
| evals.append(eval_multinomial(m,vals=list(lst_features[i]))) | ||
|
|
||
|
|
||
| evals = [ | ||
| eval_multinomial(m, vals=list(lst_features[i])) | ||
| for i in range(n_samples) | ||
| ] | ||
| evals=np.array(evals) | ||
| evals=evals.reshape(n_samples,1) | ||
|
|
Author
There was a problem hiding this comment.
Function gen_regression_symbolic refactored with the following changes:
- Use x is None rather than x == None (
none-compare) - Convert for loop into list comprehension [×2] (
list-comprehension) - Replace unused for index with underscore (
for-index-underscore) - Inline variable that is immediately returned (
inline-immediately-returned-variable) - Move assignment closer to its usage within a block (
move-assign-in-block) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Branch
masterrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run:Help us improve this pull request!