Sourcery refactored master branch #36

sourcery-ai · 2020-11-01T09:48:26Z

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^

sourcery-ai · 2020-11-01T09:48:27Z

grains/abaqus.py

-        sections = []
-        for material in a.materials.keys():
-            sections.append('*SOLID SECTION, ELSET={0}, MATERIAL={0}\n'.format(material))
+        sections = [
+            '*SOLID SECTION, ELSET={0}, MATERIAL={0}\n'.format(material)
+            for material in a.materials.keys()
+        ]
+


Function Material.add_sections refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2020-11-01T09:48:27Z

grains/abaqus.py

-            abaqus_format = ['\n** -------------------------------------------------------------\n']
-            abaqus_format.append('**\n** STEP: {0}\n**\n'.format(step_name))
+            abaqus_format = [
+                '\n** -------------------------------------------------------------\n',
+                '**\n** STEP: {0}\n**\n'.format(step_name),
+            ]
+
            nlgeom = modules['step_options']['nlgeom']
            increment = modules['step_options']['inc']
            abaqus_format.append('*Step, name={0}, nlgeom={1}, inc={2}\n'
                                 .format(step_name, nlgeom, increment))
            for module_name, module_items in modules.items():
+                if module_name == 'step_options':
+                    continue


Function Procedure.__format refactored with the following changes:

Simplify conditional into switch-like form (switch)

Extract guard clause from elif block (guard)

Merge append into list declaration (merge-list-append)

sourcery-ai · 2020-11-01T09:48:28Z

grains/analysis.py

-    ax = parsed_options['ax'] if parsed_options['ax'] else plt.figure().add_subplot()
+    ax = parsed_options['ax'] or plt.figure().add_subplot()


Function plot_grain_characteristic refactored with the following changes:

Simplify if expression by using or (or-if-exp-identity)

sourcery-ai · 2020-11-01T09:48:28Z

grains/cad.py

-    if edge_sum > 0:
-        orientation = 'cw'
-    else:
-        orientation = 'ccw'
-    return orientation
+    return 'cw' if edge_sum > 0 else 'ccw'


Function polygon_orientation refactored with the following changes:

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

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

sourcery-ai · 2020-11-01T09:48:28Z

grains/cad.py

-    for vertex in range(n_branch - 1):
+    for _ in range(n_branch - 1):


Function branches2boundary refactored with the following changes:

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

sourcery-ai · 2020-11-01T09:48:29Z

grains/geometry.py

-        ax = method_options['ax'] if method_options['ax'] else plt.figure().add_subplot()
+        ax = method_options['ax'] or plt.figure().add_subplot()


Function Polygon.plot refactored with the following changes:

Simplify if expression by using or (or-if-exp-identity)

sourcery-ai · 2020-11-01T09:48:29Z

grains/med.py

-    node_groups = {}
-    for group_name in group_names:
-        node_groups[group_name] = mesh.getGroupArr(1, group_name).toNumPyArray()
+    node_groups = {
+        group_name: mesh.getGroupArr(1, group_name).toNumPyArray()
+        for group_name in group_names
+    }
+


Function get_nodes refactored with the following changes:

Convert for loop into dictionary comprehension (dict-comprehension)

sourcery-ai · 2020-11-01T09:48:29Z

grains/meshing.py

-        repr_OOF = "QuadSkeleton(left_right_periodicity={1}, " \
+        return "QuadSkeleton(left_right_periodicity={1}, " \
            "top_bottom_periodicity={2})".format(self.leftright_periodicity,
                                                 self.topbottom_periodicity)
-        return repr_OOF


Function QuadSkeletonGeometry.__repr__ refactored with the following changes:

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

sourcery-ai · 2020-11-01T09:48:29Z

grains/meshing.py

-        repr_OOF = "TriSkeleton(arrangement='{0}', left_right_periodicity={1}, " \
+        return "TriSkeleton(arrangement='{0}', left_right_periodicity={1}, " \
            "top_bottom_periodicity={2})".format(self.arrangement,
                                                 self.leftright_periodicity,
                                                 self.topbottom_periodicity)
-        return repr_OOF


Function TriSkeletonGeometry.__repr__ refactored with the following changes:

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

sourcery-ai · 2020-11-01T09:48:30Z

grains/segmentation.py

-        if args:
-            image = args[0]
-        else:
-            image = self.original_image
+        image = args[0] if args else self.original_image


Function Segmentation.initial_segmentation refactored with the following changes:

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

sourcery-ai · 2020-11-01T09:48:42Z

Sourcery Code Quality Report

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

Quality metrics	Before	After	Change
Complexity	3.53 ⭐	3.52 ⭐	-0.01 👍
Method Length	69.62 🙂	69.26 🙂	-0.36 👍
Working memory	8.04 🙂	8.04 🙂	0.00
Quality	76.23% ⭐	76.30% ⭐	0.07% 👍

Other metrics	Before	After	Change
Lines	4414	4410	-4

Changed files	Quality Before	Quality After	Quality Change
grains/abaqus.py	71.73% 🙂	71.71% 🙂	-0.02% 👎
grains/analysis.py	69.46% 🙂	69.48% 🙂	0.02% 👍
grains/cad.py	73.64% 🙂	73.74% 🙂	0.10% 👍
grains/geometry.py	76.78% ⭐	76.78% ⭐	0.00%
grains/med.py	76.66% ⭐	76.49% ⭐	-0.17% 👎
grains/meshing.py	85.53% ⭐	85.78% ⭐	0.25% 👍
grains/segmentation.py	77.02% ⭐	77.16% ⭐	0.14% 👍

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
grains/abaqus.py	Procedure.read	44 ⛔	636 ⛔	27 ⛔	5.97% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
grains/geometry.py	TriMesh.plot	19 😞	292 ⛔	16 ⛔	27.31% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
grains/abaqus.py	Material.read	16 🙂	233 ⛔	20 ⛔	29.05% 😞	Try splitting into smaller methods. Extract out complex expressions
grains/cad.py	branches2boundary	20 😞	202 😞	14 😞	33.74% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
grains/meshing.py	OOF2.materials2groups	24 😞	131 😞	12 😞	40.85% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions

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!

Let us know what you think of it by mentioning @sourcery-ai in a comment.

'Refactored by Sourcery'

8e38d91

sourcery-ai bot requested a review from CsatiZoltan November 1, 2020 09:48

sourcery-ai bot commented Nov 1, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #36

Sourcery refactored master branch #36

sourcery-ai bot commented Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot Nov 1, 2020

sourcery-ai bot commented Nov 1, 2020

		ax = parsed_options['ax'] if parsed_options['ax'] else plt.figure().add_subplot()
		ax = parsed_options['ax'] or plt.figure().add_subplot()

		for vertex in range(n_branch - 1):
		for _ in range(n_branch - 1):

		ax = method_options['ax'] if method_options['ax'] else plt.figure().add_subplot()
		ax = method_options['ax'] or plt.figure().add_subplot()

Sourcery refactored master branch #36

Are you sure you want to change the base?

Sourcery refactored master branch #36

Conversation

sourcery-ai bot commented Nov 1, 2020

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot Nov 1, 2020

Choose a reason for hiding this comment

sourcery-ai bot commented Nov 1, 2020

Sourcery Code Quality Report

Legend and Explanation