Skip to content

Disk margin calculations #1146

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
murrayrm merged 40 commits into from
Jun 25, 2025
+814 −4
Merged

Disk margin calculations #1146

Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f6dada2
Initial version of disk margin calculation and example/test script
josiahdelange Jan 11, 2025
bdb82a5
Merge remote-tracking branch 'origin' into jdelange/disk-margins
josiahdelange Jan 11, 2025
e46f824
Comment updates: update margins.py header, clarify import exception h…
josiahdelange Jan 11, 2025
1e3af88
More work in progress on disk margin calculation, adding new prototyp…
josiahdelange Jan 12, 2025
ba15789
Add disk_margin_plot to subroutine list in comment header in margins.py
josiahdelange Jan 12, 2025
e47ae02
Follow-on to ba157895fee83ecc15bd5c1bcd8f56f4e50778a5, add disk_margi…
josiahdelange Jan 12, 2025
20686fe
Merge branch 'python-control:main' into jdelange/disk-margins
josiahdelange Jan 13, 2025
f84221d
More work in progress on disk_margin_plot. Corrected a typo/bug in the
josiahdelange Jan 14, 2025
edf8040
Merge branch 'jdelange/disk-margins' of github.com:josiahdelange/pyth…
josiahdelange Jan 14, 2025
9d55419
Merge remote-tracking branch 'origin/main' into jdelange/disk-margins
josiahdelange Apr 12, 2025
2cf1545
Further progress/debugging on disk margin calculation + plot utility
josiahdelange Apr 21, 2025
bbf37f0
Merge remote-tracking branch 'origin/main' into jdelange/disk-margins
josiahdelange Apr 21, 2025
c3efe75
Clean up docstring/code for disk_margin_plot
josiahdelange Apr 21, 2025
63c8523
Clean up docstring/code for disk_margin_plot
josiahdelange Apr 21, 2025
cffc3e5
Remove debugging statements, update comments, add unit tests.
josiahdelange Apr 23, 2025
91517f9
Minor change to fix logic to find minimum across DGM, DPM numpy vectors
josiahdelange Apr 24, 2025
86329e0
Rename disk margin example, since unit tests are now written in contr…
josiahdelange Apr 24, 2025
d92fb20
Remove unneeded dependencies from margins.py, used for debugging
josiahdelange Apr 24, 2025
b2a2edc
Minor updates to docstrings
josiahdelange Apr 24, 2025
1f0ee52
Undo d92fb2045a786581741ddb703819f7ae5865a323
josiahdelange Apr 24, 2025
ba41e8c
Minor tweaks to plots in example script for readability
josiahdelange Apr 24, 2025
14eb315
Fix typo in disk_margin_plot.
josiahdelange Apr 24, 2025
0bebc1d
Fix mag2db import hack/workaround and trim down disk_margin docstring.
josiahdelange Apr 25, 2025
87714bd
Add input handling to disk_margin, clean up column width/comments
josiahdelange Apr 26, 2025
c17910f
Move disk_margin_plot out of the library into the example script
josiahdelange Apr 26, 2025
5f34a7b
Recommended changes from the linter
josiahdelange Apr 26, 2025
f0e2d74
Follow-on to 5f34a7bea410715ee1389a36cd8de3e7001ebf34
josiahdelange Apr 26, 2025
a5fcb91
Add disk_margins to function list
josiahdelange Apr 26, 2025
077d538
Whittle down the docstring from disk_margins
josiahdelange Apr 26, 2025
8f0c037
Put more comments in the disk margin example, add example to document…
josiahdelange Apr 26, 2025
ce80819
Fixing docstrings
josiahdelange Apr 26, 2025
397efab
Corrected expected values for 'no-slycot' condition in newly-added un…
josiahdelange Apr 26, 2025
cc02712
Attempt #2 at 397efabbe7ff9dcc11f2c4309ba73d63ed44d742, based on lint…
josiahdelange Apr 26, 2025
e8897f6
Address @murrayrm review comments.
josiahdelange Apr 29, 2025
579f24b
Update formatting per PEP8/@murrayrm review comments. Add additional…
josiahdelange Apr 29, 2025
fe79760
Follow-on to e8897f6fb57d1c9f7b7409055383083cdb59ae68: remove now-unn…
josiahdelange Apr 29, 2025
b85147e
Update formatting per @murrayrm review comments
josiahdelange Jun 22, 2025
7186406
Merge branch 'python-control:main' into jdelange/disk-margins
josiahdelange Jun 22, 2025
eb3af29
Remove temporarily-added string from docstring
josiahdelange Jun 22, 2025
bb06c9e
Minor tweak to docstring to fit the word 'function' back into the des…
josiahdelange Jun 22, 2025
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into jdelange/disk-margins
  • Loading branch information
@josiahdelange
josiahdelange committed Apr 21, 2025
commit bbf37f0afd1e0ffcc462f6ddce89895a51063813

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.