Sourcery Starbot ⭐ refactored ClaasRostock/stgem #1

SourceryAI · 2023-05-11T16:44:46Z

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

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

SourceryAI

Due to GitHub API limits, only the first 60 comments can be shown.

SourceryAI · 2023-05-11T16:44:48Z

docs/source/conf.py

-                l = "    " + l.lstrip()
+                l = f"    {l.lstrip()}"


Function _normalize_docstring_lines refactored with the following changes:

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

SourceryAI · 2023-05-11T16:44:48Z

notebooks/common.py

-        raise Exception("No path '{}'.".format(path))
+        raise Exception(f"No path '{path}'.")

    results = []
    for dir, subdirs, files in os.walk(path):
-        for file in files:
-            if file.startswith(prefix):
-                results.append(os.path.join(dir, file))
-
+        results.extend(
+            os.path.join(dir, file)
+            for file in files
+            if file.startswith(prefix)
+        )


Function collect_replica_files refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

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

SourceryAI · 2023-05-11T16:44:48Z

notebooks/common.py

-    results = []
-    for file in files:
-        results.append(STGEMResult.restore_from_file(file))
-
+    results = [STGEMResult.restore_from_file(file) for file in files]


Function load_results refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

SourceryAI · 2023-05-11T16:44:48Z

notebooks/common.py

-                raise Exception("Empty experiment for prefix '{}' for benchmark '{}'.".format(prefix, benchmark))
+                raise Exception(
+                    f"Empty experiment for prefix '{prefix}' for benchmark '{benchmark}'."
+                )


Function loadExperiments refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2023-05-11T16:44:49Z

notebooks/common.py

-    c = 0
-    for result in experiment:
-        c += 1 if any(step.success for step in result.step_results) else 0
-
+    c = sum(
+        1 if any(step.success for step in result.step_results) else 0
+        for result in experiment
+    )


Function falsification_rate refactored with the following changes:

Convert for loop into call to sum() (sum-comprehension)

SourceryAI · 2023-05-11T16:44:51Z

problems/arch-comp-2021/afc/benchmark.py

-                   )      
+                   )
    step_2 = Search(mode=mode,
                    budget_threshold={"executions": 300},
                    algorithm=OGAN(model_factory=(lambda: OGAN_Model(ogan_model_parameters["convolution"])), parameters=ogan_parameters)
                    #algorithm=WOGAN(model_factory=(lambda: WOGAN_Model())
                   )
-    #steps = [step_1]
-    steps = [step_1, step_2]
-    return steps
+    return [step_1, step_2]


Function step_factory refactored with the following changes:

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

This removes the following comments ( why? ):

#steps = [step_1]

SourceryAI · 2023-05-11T16:44:51Z

problems/arch-comp-2021/at/benchmark.py

-                   )      
+                   )
    step_2 = Search(mode=mode,
                    budget_threshold={"executions": 300},
                    algorithm=OGAN(model_factory=(lambda: OGAN_Model(ogan_model_parameters["convolution"])), parameters=ogan_parameters),
                    #algorithm=WOGAN(model_factory=(lambda: WOGAN_Model())),
                    results_include_models=False
                   )
-    #steps = [step_1]
-    steps = [step_1, step_2]
-    return steps
+    return [step_1, step_2]


Function step_factory refactored with the following changes:

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

This removes the following comments ( why? ):

#steps = [step_1]

SourceryAI · 2023-05-11T16:44:51Z

problems/arch-comp-2021/cc/benchmark.py

-                   )      
+                   )
    step_2 = Search(mode=mode,
                    budget_threshold={"executions": 300},
                    algorithm=OGAN(model_factory=(lambda: OGAN_Model(ogan_model_parameters["convolution"])), parameters=ogan_parameters),
                    #algorithm=WOGAN(model_factory=(lambda: WOGAN_Model())),
                    results_include_models=False
                   )
-    #steps = [step_1]
-    steps = [step_1, step_2]
-    return steps
+    return [step_1, step_2]


Function step_factory refactored with the following changes:

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

This removes the following comments ( why? ):

#steps = [step_1]

SourceryAI · 2023-05-11T16:44:51Z

problems/arch-comp-2021/f16/benchmark.py

-    # Notice that here the input is a vector.
-    if selected_specification == "F16":
-        specification = "always[0,15] ALTITUDE > 0"
-
-        specifications = [specification]
-        strict_horizon_check = True
-    else:
-        raise Exception("Unknown specification '{}'.".format(selected_specification))
+    if selected_specification != "F16":
+        raise Exception(f"Unknown specification '{selected_specification}'.")

+    specifications = ["always[0,15] ALTITUDE > 0"]
+    strict_horizon_check = True


Function build_specification refactored with the following changes:

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

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

Inline variable that is only used once (inline-variable)

Replace call to format with f-string (use-fstring-for-formatting)

This removes the following comments ( why? ):

# Notice that here the input is a vector.

SourceryAI · 2023-05-11T16:44:51Z

problems/arch-comp-2021/f16/benchmark.py

-                   )      
+                   )


Function step_factory refactored with the following changes:

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

This removes the following comments ( why? ):

#steps = [step_1]

SourceryAI · 2023-05-11T16:44:55Z

problems/arch-comp-2021/f16/f16_python_sut.py

-        if not "initial_altitude" in self.parameters:
+        if "initial_altitude" not in self.parameters:


Function F16GCAS_PYTHON2.__init__ refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

SourceryAI · 2023-05-11T16:44:55Z

problems/arch-comp-2021/f16/f16_python_sut.py

-        if not "initial_altitude" in self.parameters:
+        if "initial_altitude" not in self.parameters:


Function F16GCAS_PYTHON3.__init__ refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

SourceryAI · 2023-05-11T16:44:56Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/Autopilot.py

-        assert Nz <= self.ctrlLimits.NzMax, "autopilot commanded too low Nz ({})".format(Nz)
-        assert Nz >= self.ctrlLimits.NzMin, "autopilot commanded too high Nz ({})".format(Nz)
+        assert Nz <= self.ctrlLimits.NzMax, f"autopilot commanded too low Nz ({Nz})"
+        assert Nz >= self.ctrlLimits.NzMin, f"autopilot commanded too high Nz ({Nz})"

-        u_ref = np.array([Nz, ps, Ny_r, throttle], dtype=float)
-
-        return u_ref
+        return np.array([Nz, ps, Ny_r, throttle], dtype=float)


Function Autopilot.get_u_ref refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

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

SourceryAI · 2023-05-11T16:44:56Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/Autopilot.py

-        man_start = 2 # maneuver starts after 2 seconds
-
        if self.state == GcasAutopilot.STATE_START:


Function GcasAutopilot.advance_discrete_state refactored with the following changes:

Move assignments closer to their usage (move-assign)

SourceryAI · 2023-05-11T16:44:56Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/BuildLqrControllers.py

-        vals = []
-
-        for col in cols:
-            vals.append(mat[row, col])
-
+        vals = [mat[row, col] for col in cols]


Function subindex_mat refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

SourceryAI · 2023-05-11T16:44:58Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/plot.py

-    num_plots = sum([len(var_data) for _, var_data in plot_data_list])
+    num_plots = sum(len(var_data) for _, var_data in plot_data_list)


Function plot2d refactored with the following changes:

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

SourceryAI · 2023-05-11T16:44:58Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/rtau.py

-        rt = 1.0
+        return 1.0
    elif dp >= 50:
-        rt = .1
+        return .1
    else:
-        rt = 1.9 - .036 * dp
-
-    return rt
+        return 1.9 - .036 * dp


Function rtau refactored with the following changes:

Lift return into if (lift-return-into-if)

SourceryAI · 2023-05-11T16:44:59Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/tgear.py

-    if thtl <= .77:
-        tg = 64.94 * thtl
-    else:
-        tg = 217.38 * thtl - 117.38
-
-    return tg
+    return 64.94 * thtl if thtl <= .77 else 217.38 * thtl - 117.38


Function tgear 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 · 2023-05-11T16:44:59Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/thrust.py

-        thrst = tidl + (tmil - tidl) * power * .02
+        return tidl + (tmil - tidl) * power * .02
    else:
        s = c[i, m] * cdh + c[i + 1, m] * dh
        t = c[i, m + 1] * cdh + c[i + 1, m + 1] * dh
        tmax = s + (t - s) * dm
-        thrst = tmil + (tmax - tmil) * (power - 50) * .02
-
-    return thrst
+        return tmil + (tmax - tmil) * (power - 50) * .02


Function thrust refactored with the following changes:

Lift return into if (lift-return-into-if)

SourceryAI · 2023-05-11T16:44:59Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/util.py

-            raise TypeError("{} does not contain attribute '{}' (object was frozen)".format(self, key))
+            raise TypeError(
+                f"{self} does not contain attribute '{key}' (object was frozen)"
+            )


Function Freezable.__setattr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2023-05-11T16:45:03Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/util.py

-    if ele > 0:
-        rv = int(floor(ele))
-    else:
-        rv = int(ceil(ele))
-
-    return rv
+    return int(floor(ele)) if ele > 0 else int(ceil(ele))


Function fix 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 · 2023-05-11T16:45:03Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v1/code/util.py

-        rv = -1
+        return -1
    elif ele == 0:
-        rv = 0
+        return 0
    else:
-        rv = 1
-
-    return rv
+        return 1


Function sign refactored with the following changes:

Lift return into if (lift-return-into-if)

SourceryAI · 2023-05-11T16:45:03Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/run_f16_sim.py

-    res = {}
-    res['status'] = integrator.status
-    res['times'] = times
-    res['states'] = np.array(states, dtype=float)
-    res['modes'] = modes
-
+    res = {
+        'status': integrator.status,
+        'times': times,
+        'states': np.array(states, dtype=float),
+        'modes': modes,
+    }


Function run_f16_sim refactored with the following changes:

Merge dictionary assignment with declaration [×4] (merge-dict-assign)

SourceryAI · 2023-05-11T16:45:04Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/util.py

-            raise TypeError("{} does not contain attribute '{}' (object was frozen)".format(self, key))
+            raise TypeError(
+                f"{self} does not contain attribute '{key}' (object was frozen)"
+            )


Function Freezable.__setattr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2023-05-11T16:45:04Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/util.py

-    width = max(width, max([len(l) for l in col_labels]))
+    width = max(width, max(len(l) for l in col_labels))

    if row_labels is not None:
-        width = max(width, max([len(l) for l in row_labels]))
+        width = max(width, max(len(l) for l in row_labels))


Function printmat refactored with the following changes:

Replace unneeded comprehension with generator [×2] (comprehension-to-generator)

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2023-05-11T16:45:06Z

...ch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/examples/waypoint/waypoint_autopilot.py

-        rv = self.waypoint_index >= len(self.waypoints) and self.done_time + 5.0 < t
-
-        return rv
+        return self.waypoint_index >= len(self.waypoints) and self.done_time + 5.0 < t


Function WaypointAutopilot.is_finished refactored with the following changes:

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

SourceryAI · 2023-05-11T16:45:06Z

...ch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/examples/waypoint/waypoint_autopilot.py

-        horiz_range = np.linalg.norm(delta[0:2])
+        horiz_range = np.linalg.norm(delta[:2])


Function WaypointAutopilot.get_waypoint_data refactored with the following changes:

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

SourceryAI · 2023-05-11T16:45:06Z

...ch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/examples/waypoint/waypoint_autopilot.py

-    if abs(phi): # if cos(phi) ~= 0, basically
-        nz = 1 / cos(phi) - 1 # Keeps plane at altitude
-    else:
-        nz = 0
-
-    return nz
+    return 1 / cos(phi) - 1 if abs(phi) else 0


Function get_nz_for_level_turn_ol refactored with the following changes:

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

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

This removes the following comments ( why? ):

# Keeps plane at altitude # if cos(phi) ~= 0, basically

SourceryAI · 2023-05-11T16:45:06Z

...ch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/examples/waypoint/waypoint_autopilot.py

-    gamma = asin((cos(alpha)*sin(theta)- \
-        sin(alpha)*cos(theta)*cos(phi))*cos(beta) - \
-        (cos(theta)*sin(phi))*sin(beta))
-
-    return gamma
+    return asin(
+        (cos(alpha) * sin(theta) - sin(alpha) * cos(theta) * cos(phi))
+        * cos(beta)
+        - (cos(theta) * sin(phi)) * sin(beta)
+    )


Function get_path_angle refactored with the following changes:

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

SourceryAI · 2023-05-11T16:45:06Z

problems/arch-comp-2021/f16/AeroBenchVVPython/v2/code/aerobench/highlevel/controlled_f16.py

-    assert f16_model in ['stevens', 'morelli'], 'Unknown F16_model: {}'.format(f16_model)
+    assert f16_model in ['stevens', 'morelli'], f'Unknown F16_model: {f16_model}'

    x_ctrl, u_deg = llc.get_u_deg(u_ref, x_f16)

    # Note: Control vector (u) for subF16 is in units of degrees
-    xd_model, Nz, Ny, _, _ = subf16_model(x_f16[0:13], u_deg, f16_model)
+    xd_model, Nz, Ny, _, _ = subf16_model(x_f16[:13], u_deg, f16_model)


Function controlled_f16 refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] [×2] (remove-redundant-slice-index)

This removes the following comments ( why? ):

# inner-loop commands are 4-7

'Refactored by Sourcery'

9d9b261

SourceryAI commented May 11, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery Starbot ⭐ refactored ClaasRostock/stgem #1

Sourcery Starbot ⭐ refactored ClaasRostock/stgem #1

SourceryAI commented May 11, 2023

SourceryAI left a comment

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

SourceryAI May 11, 2023

		if not "initial_altitude" in self.parameters:
		if "initial_altitude" not in self.parameters:

		man_start = 2 # maneuver starts after 2 seconds

		if self.state == GcasAutopilot.STATE_START:

		num_plots = sum([len(var_data) for _, var_data in plot_data_list])
		num_plots = sum(len(var_data) for _, var_data in plot_data_list)

		horiz_range = np.linalg.norm(delta[0:2])
		horiz_range = np.linalg.norm(delta[:2])

Sourcery Starbot ⭐ refactored ClaasRostock/stgem #1

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored ClaasRostock/stgem #1

Conversation

SourceryAI commented May 11, 2023

SourceryAI left a 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

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