Skip to content

Add sb10yd - #203

Merged
bnavigator merged 11 commits into
python-control:masterfrom
KybernetikJo:add_sb10yd
Aug 26, 2023
Merged

Add sb10yd#203
bnavigator merged 11 commits into
python-control:masterfrom
KybernetikJo:add_sb10yd

Conversation

@KybernetikJo

@KybernetikJoKybernetikJo commented Aug 1, 2023

Copy link
Copy Markdown
Contributor

This Draft/PR adds the SLICOT Function SB10YD.f.
A merge would close the issue #153.

It's working, following thing could be improved::

  • Slightly improve docstring.
  • Slightly improve unittests.
  • The order of the procedures must be restored.

@KybernetikJo
KybernetikJo marked this pull request as ready for review August 3, 2023 16:12
@KybernetikJoKybernetikJo mentioned this pull request Aug 8, 2023
10 tasks
@KybernetikJoKybernetikJo changed the title Add sb01ydAdd sb10ydAug 17, 2023
Comment threadslycot/tests/test_sb10yd.py Outdated
Comment threadslycot/tests/test_sb10yd.py Outdated
@KybernetikJo

Copy link
Copy Markdown
ContributorAuthor

@bnavigator

How I get your force-push into my local and origin branch?
I think I've done double work here.

@bnavigator

Copy link
Copy Markdown
Collaborator

It's alright, you did good. My force push was just a revert to (your) ddb8c03 because my attempt to resolve the merge conflict in 86032c8 had a mistake.

If there is a relevant change to your origin, you must merge or rebase your origin into your local before proceeding to push to origin.

Comment threadslycot/synthesis.py
mn = min(2*lendat,2*n+1)
if n > 0:
lw3 = 2*lendat*(2*n+1) + max(2*lendat,2*n+1) + max(mn+6*n+4,2*mn+1)
elif n == 0:

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Could you please cover this case in the unit tests?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have to look into that.

@bnavigator

Copy link
Copy Markdown
Collaborator

Please rebase your feature branch onto master, there are some duplicate commits now

@KybernetikJo

Copy link
Copy Markdown
ContributorAuthor

Yup, I have done something wrong.
I will try to fix it.

@bnavigator

Copy link
Copy Markdown
Collaborator

I fixed some linting warning in the tests, mainly in order to trigger a new CI run with a new commit. Somehow 6ff1902 was not picked up by GitHub Actions.

@bnavigatorbnavigator left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM

@bnavigator
bnavigator merged commit 60a5c71 into python-control:masterAug 26, 2023
@bnavigatorbnavigator mentioned this pull request Aug 26, 2023
@bnavigatorbnavigator added this to the 0.6.0 milestone Aug 26, 2023
@KybernetikJo
KybernetikJo deleted the add_sb10yd branch January 6, 2024 19:59
Sign up for freeto 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.

2 participants

@KybernetikJo@bnavigator