Sourcery Starbot ⭐ refactored nicrie/xmca #26

SourceryAI · 2021-10-14T07:47:24Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch https://github.com/sourcery-ai-bot/xmca master
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI · 2021-10-14T07:47:26Z

tests/integration/test_integration_array.py

-        if flavour == 'varmx':
+        elif flavour == 'varmx':


Function TestIntegration.test_plot refactored with the following changes:

Simplify conditional into switch-like form (switch)

SourceryAI · 2021-10-14T07:47:26Z

tests/integration/test_integration_xarray.py

-        if analysis == 'varmx':
+        elif analysis == 'varmx':


Function TestIntegration.test_getter refactored with the following changes:

Simplify conditional into switch-like form (switch)

SourceryAI · 2021-10-14T07:47:26Z

tests/integration/test_integration_xarray.py

-        if analysis == 'varmx':
+        elif analysis == 'varmx':


Function TestIntegration.test_hom_het_patterns refactored with the following changes:

Simplify conditional into switch-like form (switch)

SourceryAI · 2021-10-14T07:47:26Z

tests/integration/test_integration_xarray.py

-        if analysis == 'varmx':
+        elif analysis == 'varmx':


Function TestIntegration.test_field refactored with the following changes:

Simplify conditional into switch-like form (switch)

SourceryAI · 2021-10-14T07:47:27Z

tests/integration/test_integration_xarray.py

-        if analysis == 'varmx':
+        elif analysis == 'varmx':


Function TestIntegration.test_field_scaling refactored with the following changes:

Simplify conditional into switch-like form (switch)

SourceryAI · 2021-10-14T07:47:28Z

xmca/array.py

-        if any([np.isnan(field).all() for field in self._fields.values()]):
+        if any(np.isnan(field).all() for field in self._fields.values()):


Function MCA.solve refactored with the following changes:

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

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

SourceryAI · 2021-10-14T07:47:28Z

xmca/array.py

-            if isinstance(n, slice):
-                max_mode = n.stop
-            else:
-                max_mode = n
-
+            max_mode = n.stop if isinstance(n, slice) else n


Function MCA._get_V refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:28Z

xmca/array.py

-            if isinstance(n, slice):
-                max_mode = n.stop
-            else:
-                max_mode = n
-
+            max_mode = n.stop if isinstance(n, slice) else n


Function MCA._get_U refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:28Z

xmca/array.py

-        if self._analysis['is_bivariate']:
-            var = norm['left'] * norm['right']
-        else:
-            var = norm['left']**2
-
-        return var
+        return (
+            norm['left'] * norm['right']
+            if self._analysis['is_bivariate']
+            else norm['left'] ** 2
+        )


Function MCA._get_variance refactored with the following changes:

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

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

SourceryAI · 2021-10-14T07:47:28Z

xmca/array.py

-        norm    = {}
-        norm['left']    = np.linalg.norm(L_rot[:n_vars_left, :], axis=0)
+        norm = {'left': np.linalg.norm(L_rot[:n_vars_left, :], axis=0)}


Function MCA.rotate refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:31Z

xmca/array.py

-        scf = variance**2 / self._analysis['total_squared_covariance'] * 100
-        return scf
+        return variance**2 / self._analysis['total_squared_covariance'] * 100


Function MCA.scf refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:31Z

xmca/array.py

-        exp_var = variance / self._analysis['total_covariance'] * 100
-        return exp_var
+        return variance / self._analysis['total_covariance'] * 100


Function MCA.explained_variance refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:31Z

xmca/array.py

-        phases = {}
-        for key, eof in eofs.items():
-            phases[key] = np.arctan2(eof.imag, eof.real).real
-
-        return phases
+        return {key: np.arctan2(eof.imag, eof.real).real for key, eof in eofs.items()}


Function MCA.spatial_phase refactored with the following changes:

Convert for loop into dictionary comprehension (dict-comprehension)

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

SourceryAI · 2021-10-14T07:47:31Z

xmca/array.py

-        phases = {}
-        for key, pc in pcs.items():
-            phases[key] = np.arctan2(pc.imag, pc.real).real
-
-        return phases
+        return {key: np.arctan2(pc.imag, pc.real).real for key, pc in pcs.items()}


Function MCA.temporal_phase refactored with the following changes:

Convert for loop into dictionary comprehension (dict-comprehension)

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

SourceryAI · 2021-10-14T07:47:31Z

xmca/array.py

-        if path is None:
-            output = 'mode{:}.png'.format(mode)
-        else:
-            output = path
-
+        output = 'mode{:}.png'.format(mode) if path is None else path


Function MCA.save_plot refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:32Z

xmca/xarray.py

-                if k1 in ['eof', 'phase']:
-                    if k2 in ['left', 'right']:
-                        map_projs[k1][k2] = projection.get(k2, None)
+                if k1 in ['eof', 'phase'] and k2 in ['left', 'right']:
+                    map_projs[k1][k2] = projection.get(k2, None)


Function xMCA._create_gridspec refactored with the following changes:

Merge nested if conditions (merge-nested-ifs)

SourceryAI · 2021-10-14T07:47:32Z

xmca/tools/array.py

-    nan_index = np.isnan(arr).any(axis=0)
-
-    return nan_index
+    return np.isnan(arr).any(axis=0)


Function get_nan_cols refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:33Z

xmca/tools/array.py

-    new_arr  = arr[:, ~idx]
-
-    return new_arr
+    return arr[:, ~idx]


Function remove_nan_cols refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:33Z

xmca/tools/rotation.py

-    for i in range(maxIter):
+    for _ in range(maxIter):


Function varimax refactored with the following changes:

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

SourceryAI · 2021-10-14T07:47:33Z

xmca/tools/xarray.py

-    if(isinstance(data, xr.DataArray)):
-        pass
-    else:
+    if not (isinstance(data, xr.DataArray)):


Function is_DataArray refactored with the following changes:

Swap if/else to remove empty if body (remove-pass-body)

'Refactored by Sourcery'

7d32c3c

SourceryAI commented Oct 14, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery Starbot ⭐ refactored nicrie/xmca #26

Sourcery Starbot ⭐ refactored nicrie/xmca #26

SourceryAI commented Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

SourceryAI Oct 14, 2021

		if any([np.isnan(field).all() for field in self._fields.values()]):
		if any(np.isnan(field).all() for field in self._fields.values()):

Sourcery Starbot ⭐ refactored nicrie/xmca #26

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored nicrie/xmca #26

Conversation

SourceryAI commented Oct 14, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment