Skip to content

BUG: Duplicate _controllers in Flight.TimeNodes.merge() #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gui-FernandesBR merged 2 commits into from
Feb 28, 2026
+1 −2
Merged

BUG: Duplicate _controllers in Flight.TimeNodes.merge() #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a172d1a
Fix: Duplicate merge of _controllers in Flight.TimeNodes.merge()
zuorenchen Feb 21, 2026
38a808a
BUG: Fix duplicate controllers in Flight.TimeNodes.merge()
zuorenchen Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Attention: The newest changes should be on top -->
- BUG: energy_data plot not working for 3 dof sims [[#906](https://github.com/RocketPy-Team/RocketPy/issues/906)]
- BUG: Fix CSV column header spacing in FlightDataExporter [#864](https://github.com/RocketPy-Team/RocketPy/issues/864)
- BUG: Fix parallel Monte Carlo simulation showing incorrect iteration count [#806](https://github.com/RocketPy-Team/RocketPy/pull/806)

- BUG: Duplicate _controllers in Flight.TimeNodes.merge() [#931](https://github.com/RocketPy-Team/RocketPy/pull/931)

## [v1.11.0] - 2025-11-01

Expand Down
1 change: 0 additions & 1 deletion rocketpy/simulation/flight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4589,7 +4589,6 @@ def merge(self):
tmp_dict[time]._controllers += node._controllers
tmp_dict[time].callbacks += node.callbacks
tmp_dict[time]._component_sensors += node._component_sensors
tmp_dict[time]._controllers += node._controllers
except KeyError:
# If the node does not exist, add it to the dictionary
tmp_dict[time] = node
Expand Down