Sourcery refactored main branch #6

sourcery-ai · 2023-11-30T13:11:53Z

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

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

Help us improve this pull request!

sourcery-ai · 2023-11-30T13:12:35Z

Plotting/interactive_decision_tree.py

-    # classify features into 3 types: binary, float and int
-    binary_features = []
-    for col in X.columns.values:
-        if list(sorted(np.unique(X[col].values))) == [0, 1]:
-            binary_features.append(col)
-
-    int_features = []
-    for col in list(set(X.columns.values) - set(binary_features)):
-        if list(X[col].map(int).values) == list(X[col].values):
-            int_features.append(col)
-
+    binary_features = [
+        col
+        for col in X.columns.values
+        if list(sorted(np.unique(X[col].values))) == [0, 1]
+    ]
+    int_features = [
+        col
+        for col in list(set(X.columns.values) - set(binary_features))
+        if list(X[col].map(int).values) == list(X[col].values)
+    ]


Function _get_tree_info refactored with the following changes:

Convert for loop into list comprehension [×3] (list-comprehension)

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

Swap if/else branches (swap-if-else-branches)

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

This removes the following comments ( why? ):

# classify features into 3 types: binary, float and int

sourcery-ai · 2023-11-30T13:12:35Z

Plotting/interactive_decision_tree.py

-    features = tree_info['features']
-    binary_features = tree_info['binary_features']
-    int_features = tree_info['int_features']
    target_names = tree_info['target_names']

    node = {}
    if parent == 'null':
        node['name'] = "HEAD"
    else:
+        features = tree_info['features']
        feature = features[parent]
+        binary_features = tree_info['binary_features']
+        int_features = tree_info['int_features']
        if pos == 'left':
            if feature in binary_features:
-                node['name'] = feature + ': 0'
+                node['name'] = f'{feature}: 0'
            elif feature in int_features:
-                node['name'] = feature + " <= " + str(int(tree_model.tree_.threshold[parent]))
+                node['name'] = f"{feature} <= {int(tree_model.tree_.threshold[parent])}"
            else:
-                node['name'] = feature + " <= " + str(round(tree_model.tree_.threshold[parent], 3))
+                node[
+                    'name'
+                ] = f"{feature} <= {str(round(tree_model.tree_.threshold[parent], 3))}"
+        elif feature in binary_features:
+            node['name'] = f'{feature}: 1'
+        elif feature in int_features:
+            node['name'] = f"{feature} > {int(tree_model.tree_.threshold[parent])}"
        else:
-            if feature in binary_features:
-                node['name'] = feature + ': 1'
-            elif feature in int_features:
-                node['name'] = feature + " > " + str(int(tree_model.tree_.threshold[parent]))
-            else:
-                node['name'] = feature + " > " + str(round(tree_model.tree_.threshold[parent], 3))
+            node[
+                'name'
+            ] = f"{feature} > {str(round(tree_model.tree_.threshold[parent], 3))}"


Function _parse_tree refactored with the following changes:

Move assignments closer to their usage (move-assign)

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

Use f-string instead of string concatenation [×10] (use-fstring-for-concatenation)

Hoist conditional out of nested conditional [×2] (hoist-if-from-if)

Remove unnecessary calls to str() from formatted values in f-strings [×2] (remove-str-from-fstring)

sourcery-ai · 2023-11-30T13:12:35Z

Plotting/interactive_decision_tree.py

-    tree_rules[node_id] = {}
-    tree_rules[node_id]['features'] = {}
-
+    tree_rules[node_id] = {'features': {}}


Function _extract_rules refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

sourcery-ai · 2023-11-30T13:12:35Z

Plotting/interactive_decision_tree.py

-                    if feat[0] == -sys.maxsize:
-                        rule = k + ': 0'
-                    else:
-                        rule = k + ': 1'
+                    rule = f'{k}: 0' if feat[0] == -sys.maxsize else f'{k}: 1'
                elif k in tree_info['int_features']:
                    if feat[0] == -sys.maxsize:
-                        rule = k + ' <= ' + str(int(feat[1]))
+                        rule = f'{k} <= {int(feat[1])}'
                    elif feat[1] == sys.maxsize:
-                        rule = k + ' > ' + str(int(feat[0]))
+                        rule = f'{k} > {int(feat[0])}'
                    else:
-                        rule = str(int(feat[0])) + ' < ' + k + ' <= ' + str(int(feat[1]))
+                        rule = f'{int(feat[0])} < {k} <= {int(feat[1])}'
+                elif feat[0] == -sys.maxsize:
+                    rule = f'{k} <= {str(round(feat[1], 3))}'
+                elif feat[1] == sys.maxsize:
+                    rule = f'{k} > {str(round(feat[0], 3))}'
                else:
-                    if feat[0] == -sys.maxsize:
-                        rule = k + ' <= ' + str(round(feat[1], 3))
-                    elif feat[1] == sys.maxsize:
-                        rule = k + ' > ' + str(round(feat[0], 3))
-                    else:
-                        rule = str(round(feat[0], 3)) + ' < ' + k + ' <= ' + str(round(feat[1], 3))
+                    rule = f'{str(round(feat[0], 3))} < {k} <= {str(round(feat[1], 3))}'


Function _clean_rules refactored with the following changes:

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

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

Use f-string instead of string concatenation [×18] (use-fstring-for-concatenation)

Remove unnecessary calls to str() from formatted values in f-strings [×4] (remove-str-from-fstring)

sourcery-ai · 2023-11-30T13:12:35Z

Python/codon_expt.py

-    if n<=1:
-        return 1
-    return fib(n-1) + fib(n-2)
+    return 1 if n<=1 else fib(n-1) + fib(n-2)


Function fib refactored with the following changes:

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

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

sourcery-ai · 2023-11-30T13:12:36Z

Run-time Optimization/codon_expt.py

-    if n<=1:
-        return 1
-    return fib(n-1) + fib(n-2)
+    return 1 if n<=1 else fib(n-1) + fib(n-2)


Function fib refactored with the following changes:

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

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

sourcery-ai bot requested a review from ChawlaAvi November 30, 2023 13:11

'Refactored by Sourcery'

745afab

sourcery-ai bot force-pushed the sourcery/main branch from c1dcbfb to 745afab Compare November 30, 2023 13:12

sourcery-ai bot commented Nov 30, 2023

View reviewed changes

This comment was marked as duplicate.

Sign in to view

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored main branch #6

Sourcery refactored main branch #6

sourcery-ai bot commented Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

This comment was marked as duplicate.

Sourcery refactored main branch #6

Are you sure you want to change the base?

Sourcery refactored main branch #6

Conversation

sourcery-ai bot commented Nov 30, 2023

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

This comment was marked as duplicate.