Sourcery refactored master branch #1

sourcery-ai · 2022-04-06T09:25:50Z

Branch master refactored 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 master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-04-06T09:25:52Z

friendster_network.py

-    if years_experience < 3.0:
+    if years_experience < 3.0 or years_experience >= 8.5:
        return "paid"
-    elif years_experience < 8.5:
-        return "unpaid"
    else:
-        return "paid"


Function predict_paid_or_unpaid refactored with the following changes:

Merge duplicate blocks in conditional (merge-duplicate-blocks)

Remove redundant conditional (remove-redundant-if)

sourcery-ai · 2022-04-06T09:25:52Z

hparams_grid_search_keras_nn.py

 def load_data(filepath):
-    data = pd.read_csv(filepath)
-    return data
+    return pd.read_csv(filepath)


Function load_data refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2022-04-06T09:25:53Z

sonar_clf_rf.py

-    dataset = list()
+    dataset = []
    with open(filename, 'r') as file:
        csv_reader = reader(file)
-        for row in csv_reader:
-            if not row:
-                continue
-            dataset.append(row)
-
+        dataset.extend(row for row in csv_reader if row)


Function load_csv refactored with the following changes:

Replace list() with [] (list-literal)

Replace a for append loop with list extend (for-append-to-extend)

Lift code into else after jump in control flow (reintroduce-else)

Remove redundant continue statement (remove-redundant-continue)

sourcery-ai · 2022-04-06T09:25:53Z

sonar_clf_rf.py

-    lookup = dict()
-
-    for i, value in enumerate(unique):
-        lookup[value] = i
+    lookup = {value: i for i, value in enumerate(unique)}


Function str_columm_to_int refactored with the following changes:

Replace dict() with {} (dict-literal)

Convert for loop into dictionary comprehension (dict-comprehension)

sourcery-ai · 2022-04-06T09:25:53Z

sonar_clf_rf.py

-    dataset_split = list()
+    dataset_split = []
    dataset_copy = list(dataset)
    fold_size = int(len(dataset) / k_folds)

-    for i in range(k_folds):
-        fold = list()
+    for _ in range(k_folds):
+        fold = []


Function cross_validation_split refactored with the following changes:

Replace list() with [] (list-literal)

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-04-06T09:25:54Z

helpers/stats.py

-    else:
-        # if even,  return the average of the middle values
-        lo = midpoint - 1
-        hi = midpoint
-        return (sorted_v[lo] + sorted_v[hi]) / 2
+    # if even,  return the average of the middle values
+    lo = midpoint - 1
+    hi = midpoint
+    return (sorted_v[lo] + sorted_v[hi]) / 2


Function median refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2022-04-06T09:25:54Z

k_means_clustering/utils.py

-                i_points = [p for p, a in zip(inputs, assignments) if a == i]
-
-                if i_points:
+                if i_points := [p for p, a in zip(inputs, assignments) if a == i]:


Function KMeans.train refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2022-04-06T09:25:55Z

k_means_clustering/utils.py

-    if is_leaf(cluster):
-        return float('inf')
-    else:
-        return cluster[0]
+    return float('inf') if is_leaf(cluster) else cluster[0]


Function get_merge_order refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-04-06T09:25:55Z

k_means_clustering/utils.py

-    clusters = [input for input in inputs]
+    clusters = list(inputs)

    # as long as we have more than one cluster left...
    while len(clusters) > 1:
        # find the two closest clusters
-        c1, c2 = min([(cluster1, cluster2)
-                      for i, cluster1 in enumerate(clusters)
-                      for cluster2 in clusters[:i]],
-                     key=lambda p: cluster_distance(p[0], p[1], distance_agg))
+        c1, c2 = min(
+            (
+                (cluster1, cluster2)
+                for i, cluster1 in enumerate(clusters)
+                for cluster2 in clusters[:i]
+            ),
+            key=lambda p: cluster_distance(p[0], p[1], distance_agg),
+        )
+

        # remove them from the list of clusters
-        clusters = [c for c in clusters if c != c1 and c != c2]
+        clusters = [c for c in clusters if c not in [c1, c2]]


Function bottom_up_cluster refactored with the following changes:

Replace identity comprehension with call to collection constructor (identity-comprehension)

Replace unneeded comprehension with generator (comprehension-to-generator)

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2022-04-06T09:25:55Z

k_nearest_neighbors/utils.py

-        return winner                     # unique winner, so return it
-    else:
-        return majority_vote(labels[:-1]) # try again without the farthest
+    return winner if num_winners == 1 else majority_vote(labels[:-1])


Function majority_vote refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

This removes the following comments ( why? ):

# unique winner, so return it # try again without the farthest

sourcery-ai · 2022-04-06T09:25:59Z

k_nearest_neighbors/utils.py

-    plt.title(str(k) + "-Nearest Neighbor Programming Languages")
+    plt.title(f'{str(k)}-Nearest Neighbor Programming Languages')


Function classify_and_plot_grid refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-04-06T09:25:59Z

multiple_regression/utils.py


 def estimate_beta(x, y):
-    beta_initial = [random.random() for x_i in x[0]]
+    beta_initial = [random.random() for _ in x[0]]


Function estimate_beta refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-04-06T09:25:59Z

multiple_regression/utils.py

    """use gradient descent to fit a ridge regression
    with penalty alpha"""
-    beta_initial = [random.random() for x_i in x[0]]
+    beta_initial = [random.random() for _ in x[0]]


Function estimate_beta_ridge refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-04-06T09:25:59Z

natural_language_processing/utils.py

-        return random.randrange(1, y)
-    else:
-        return random.randrange(y - 6, 7)
+    return random.randrange(1, y) if y <= 7 else random.randrange(y - 6, 7)


Function random_x_given_y refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-04-06T09:25:59Z

natural_language_processing/utils.py

-distinct_words = set(word
-                     for document in documents
-                     for word in document)
+distinct_words = {word for document in documents for word in document}


Lines 174-176 refactored with the following changes:

Replace list(), dict() or set() with comprehension (collection-builtin-to-comprehension)

sourcery-ai · 2022-04-06T09:25:59Z

natural_language_processing/utils.py

-document_topics = [[random.randrange(K) for word in document]
-                   for document in documents]
+document_topics = [
+    [random.randrange(K) for _ in document] for document in documents
+]
+


Lines 206-215 refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-04-06T09:26:00Z

working_with_data/utils.py

-        return try_or_none(parser)(value)
-    else:
-        return value
+    return try_or_none(parser)(value) if parser is not None else value


Function try_parse_field refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-04-06T09:26:02Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.12%.

Quality metrics	Before	After	Change
Complexity	2.68 ⭐	2.59 ⭐	-0.09 👍
Method Length	37.44 ⭐	37.24 ⭐	-0.20 👍
Working memory	6.33 🙂	6.30 🙂	-0.03 👍
Quality	80.38% ⭐	80.50% ⭐	0.12% 👍

Other metrics	Before	After	Change
Lines	1571	1548	-23

Changed files	Quality Before	Quality After	Quality Change
friendster_network.py	87.86% ⭐	87.81% ⭐	-0.05% 👎
hparams_grid_search_keras_nn.py	65.54% 🙂	65.04% 🙂	-0.50% 👎
sonar_clf_rf.py	73.60% 🙂	73.49% 🙂	-0.11% 👎
helpers/gradient_descent.py	79.84% ⭐	80.27% ⭐	0.43% 👍
helpers/probabilty.py	75.54% ⭐	75.67% ⭐	0.13% 👍
helpers/stats.py	84.13% ⭐	84.80% ⭐	0.67% 👍
k_means_clustering/utils.py	81.74% ⭐	81.69% ⭐	-0.05% 👎
k_nearest_neighbors/utils.py	75.29% ⭐	75.16% ⭐	-0.13% 👎
multiple_regression/utils.py	91.81% ⭐	92.17% ⭐	0.36% 👍
natural_language_processing/utils.py	82.96% ⭐	82.83% ⭐	-0.13% 👎
working_with_data/utils.py	85.04% ⭐	85.00% ⭐	-0.04% 👎

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
working_with_data/utils.py	make_scatterplot_matrix	15 🙂	210 ⛔	7 🙂	50.23% 🙂	Try splitting into smaller methods
sonar_clf_rf.py	get_split	9 🙂	103 🙂	13 😞	54.61% 🙂	Extract out complex expressions
helpers/gradient_descent.py	minimize_stochastic	6 ⭐	103 🙂	13 😞	57.46% 🙂	Extract out complex expressions
sonar_clf_rf.py	split	9 🙂	123 😞	9 🙂	59.28% 🙂	Try splitting into smaller methods
k_nearest_neighbors/utils.py	classify_and_plot_grid	4 ⭐	137 😞	9 🙂	62.43% 🙂	Try splitting into smaller methods

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

'Refactored by Sourcery'

7e8d232

sourcery-ai bot requested a review from pruthvirajg April 6, 2022 09:25

sourcery-ai bot commented Apr 6, 2022

View reviewed changes

		plt.title(str(k) + "-Nearest Neighbor Programming Languages")
		plt.title(f'{str(k)}-Nearest Neighbor Programming Languages')

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Uh oh!

Conversation

sourcery-ai bot commented Apr 6, 2022

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot commented Apr 6, 2022

Sourcery Code Quality Report

Legend and Explanation

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant