Skip to content

Use slycot's tb05ad for faster and more accurate frequency response e… #172

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.

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

Closed
wants to merge 36 commits into from

Conversation

rabraker
Copy link
Contributor

@rabraker rabraker commented Jan 2, 2018

This pull request addresses issue #116.

It uses the (relatively) newly wrapped TB05AD function from Slycot, when Slycot is available. If slycot is not available, I instead use the state space built-in method horner, rather than converting to a transfer function for the evaluation.

This passes the unit tests on my machine (python 2.7), but currently it looks like the travis build is failing so I'm not sure what happens with other versions.

Jed and others added 30 commits February 17, 2017 13:57
Added IO cleanup function to xferfcn module.
From .eggs/README.txt:

"This directory contains eggs that were downloaded by setuptools to build, test, and run plug-ins.

This directory caches those eggs to prevent repeated downloads.

However, it is safe to delete this directory."
…function.

Added unit tests to test the cleanup function.

Added deep copy to TransferFunction args.
…valuation of state-space systems. If slycot is unavailible, use the built in horner function (instead of converting to a transfer function, as was done before).
Travis CI update for new/old scipy + improved slycot
Update conda-recipe for use with conda-build >= 3.0
Cleanup TransferFunction Input Sanitization
@murrayrm
Copy link
Member

murrayrm commented Jan 2, 2018

@rabraker Can you rebase these changes against the current master. That should fix up the problems in Travis CI and allow testing against python 3.5 and 3.6.

murrayrm and others added 3 commits January 2, 2018 08:24
Fix minreal not returning a discrete TF
…valuation of state-space systems. If slycot is unavailable, use the built in horner function (instead of converting to a transfer function, as was done before).
@coveralls
Copy link

coveralls commented Jan 2, 2018

Coverage Status

Changes Unknown when pulling 308d8b5 on rabraker:freqresp_tb05ad into ** on python-control:master**.

@rabraker
Copy link
Contributor Author

rabraker commented Jan 2, 2018

I'm evidently all thumbs with this rebasing business. Whatever I did makes all the checks pass, but somehow there are commits from others going back almost a year in this PR now. I don't know how to fix that.

So it seems easiest to me to delete this PR and I'll just make a new, clean one.

@murrayrm
Copy link
Member

murrayrm commented Jan 2, 2018

Pretty sure there is a way to rewrite history that will make this a clean commit. @slivingston is a master at git, perhaps he has some suggestions?

One possibility is that you didn't grab the upstream changes from python-control:master and that is causing the large number of extraneous commits. As I check, I did a manual merge with my copy of the master branch and the only change was to statesp.py. I think if you do git pull upstream master on your branch, it will pull in all of the latest changes and leave you with a clean commit that you can then push back.

@rabraker
Copy link
Contributor Author

rabraker commented Jan 2, 2018

With my branch freqresp_tb05ad checked out, I tried what you suggest:

git pull upstream master
From https://github.com/python-control/python-control
 * branch            master     -> FETCH_HEAD
Already up-to-date.

ie, this had no effect. I'll just close this PR and submit another.

@rabraker rabraker closed this Jan 2, 2018
@rabraker rabraker deleted the freqresp_tb05ad branch January 2, 2018 18:58
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.

4 participants