Skip to content

[#244] Refactor dynamics and fsw#273

Merged
Mark2000 merged 2 commits into
developfrom
feature/244-separate-files
Jun 10, 2025
Merged

[#244] Refactor dynamics and fsw#273
Mark2000 merged 2 commits into
developfrom
feature/244-separate-files

Conversation

@Mark2000

@Mark2000 Mark2000 commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Description

Closes #244

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

How should this pull request be reviewed?

  • By commit
  • All changes at once

How Has This Been Tested?

Passes tests.

Future Work

None

Checklist

  • I have performed a self-review of my code
  • I have commented my code in hard-to-understand areas
  • I have made corresponding changes to the documentation and release notes
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works

@Mark2000
Mark2000 force-pushed the feature/244-separate-files branch 2 times, most recently from 6cd5c2b to 4407947 Compare June 6, 2025 22:39
@Mark2000
Mark2000 marked this pull request as ready for review June 6, 2025 22:39
Copilot AI review requested due to automatic review settings June 6, 2025 22:39

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR refactors the dynamics and flight software (FSW) modules, primarily updating module paths and reorganizing code. Key changes include:

  • Updating patch decorator paths in unit and integration tests to reflect refactored module structures.
  • Moving and removing legacy FSW model implementations from the base module.
  • Introducing updated dynamics models with improved class hierarchies.

Reviewed Changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tests/unittest/sim/test_fsw.py Updated patch path for aliveness checkers to use the new base module reference.
tests/unittest/sim/test_dynamics.py Modified patch paths for spacecraft location and storage unit to reflect refactored module structure.
tests/integration/sim/test_int_dynamics.py Updated reference to FullFeaturedDynModel after refactor.
tests/integration/comm/test_int_communication.py Adjusted dynamics model import and inlined FullFeaturedDynModel definition.
src/bsk_rl/sim/fsw/orbital.py New FSW model for orbital maneuvers added.
src/bsk_rl/sim/fsw/ground_imaging.py New FSW model for ground imaging scenarios introduced.
src/bsk_rl/sim/fsw/base.py Legacy imaging FSW models removed and all updated accordingly.
src/bsk_rl/sim/fsw/init.py Updated package exports to match refactored module structure.
src/bsk_rl/sim/dyn/relative_motion.py New relative motion dynamics added for LOS communications.
src/bsk_rl/sim/dyn/init.py Updated dynamics module with new FullFeaturedDynModel export.
Comments suppressed due to low confidence (2)

tests/unittest/sim/test_dynamics.py:178

  • The updated patch path using 'relative_motion.spacecraftLocation' should be verified against the new module layout to ensure that tests properly intercept the intended functionality.
@patch(module + "relative_motion.spacecraftLocation", MagicMock())

tests/unittest/sim/test_dynamics.py:262

  • Ensure that the new patch path for 'partitionedStorageUnit' in the ground_imaging module accurately reflects the refactored file structure and is consistent with the intended functionality.
@patch(module + "ground_imaging.partitionedStorageUnit", MagicMock())

Comment thread tests/unittest/sim/test_fsw.py
@Mark2000
Mark2000 force-pushed the feature/244-separate-files branch from 4407947 to dfa0dc8 Compare June 6, 2025 22:49
@Mark2000
Mark2000 force-pushed the feature/244-separate-files branch from dfa0dc8 to 5275382 Compare June 6, 2025 22:55

@LorenzzoQM LorenzzoQM left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very useful!

@Mark2000
Mark2000 merged commit 3ce5625 into develop Jun 10, 2025
@Mark2000
Mark2000 deleted the feature/244-separate-files branch June 10, 2025 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Break dyn and fsw into separate files

3 participants