GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Rebase of call-method against current master by murrayrm · Pull Request #1 · sawyerbfuller/python-control

Conversation

@murrayrm

@murrayrm murrayrm commented Jan 6, 2021 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown

@sawyerbfuller Here's an attempt at a rebase of this PR against the current master.

@bnavigator You might want to scan this to make sure I didn't drop something from one of your merged PR's.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
sawyerbfuller and others added 30 commits August 9, 2020 23:37
@sawyerbfuller
code fix and unit test
dec1455
@sawyerbfuller
suggested fix to unit test
0b85e3b
@murrayrm
Documentation update (python-control#476)
120a926
* fix typos, equation numbering in doc/flatsys.rst
* small updates (including numpydoc fixes) to statefbk.py, mateqn.py docstrings
* update setup.py contact info
* small fixes to iosys docstrings (from samlaf)
* update lqr() return type documentation (addresses python-control#418)
* added 2D array/matrix note to all functions using _ssmatrix
* PEP8 formatting updates for statefbk.py, mateqn.py (while I was at it)
@murrayrm
Consistent return values for lqe and lqr (python-control#477)
38f29c7
* update lqe return values to match lqr
* update lqe docstring
@murrayrm
fixes to markov() + add tranpose keyword, default warning (python-con…
bd354c9
…trol#478)

* updated markov() calculation + new unit tests
* updated markov() to add tranpose keyword + default warning; tests, PEP8
* resolves issue python-control#395
@murrayrm
Sphinx update (python-control#479)
35f1e64
* fix footnote reference in markov() docstring

* require sphinx 3.4 or higher for readthedocs
@murrayrm
updated parsing for use_legacy_defaults
2dac8b8
@murrayrm
change statesp to use ndarray by default
2849413
@bnavigator
Merge pull request python-control#480 from murrayrm/array-by-default
37d1121
Switch default state space matrix type to 'array' (instead of 'matrix')
@bnavigator
Merge pull request python-control#447 from sawyerbfuller/fix-dt-impul…
daf2536
…se-size

fix impulse size for discrete-time impulse response
@bnavigator
skip impulse sampling for old scipy
90c564c
@bnavigator
Merge pull request python-control#482 from bnavigator/skip-impulse-test
26206dc
skip impulse sampling for old scipy
@bnavigator
returnScipySignalLTI for discrete systems
d6d77dc
and add unit tests
@bnavigator
Merge pull request python-control#445 from bnavigator/extend-tf2scipylti
51c797e
Extend returnScipySignalLTI() to discrete systems
@bnavigator
fix statefbk docstring and input array type
092b76c
@bnavigator
update docstring for statefbk inputs
5a9e433
@bnavigator
Merge pull request python-control#483 from bnavigator/statefbk-input-doc
f998a20
Fix lqe docstring and input array type
@bnavigator
handle empty pole vector for timevector calculation (python-control#485)
4eee1f3
@bnavigator
Refactor the test suite using pytest for array and matrix types (pyth…
c432fd5
…on-control#438)

* reorganize travis matrix, extend conftest.py

* pytestify bdalg_test

* pytestify canonical_test

* pytestify config_test

* pytestify convert_test.py

* pytestify ctrlutil_test

* pytestify delay_test.py

* pytestify discrete_test

* pytestify flatsys_test

* pytestify frd_test

* pytestify freqresp_test.py

* pytestify input_element_int_test

* pytestify iosys_test

* pytestify lti_test.py

* pytestify mateqn_test

* pytestify matlab tests

* pytestify minreal_test

* pytestify modelsimp

* pytestify nichols_test

* pytestify phaseplot_test

* pytestify rlocus_test.py

* pytestify robust tests

* pytestify sisotool_test.py

* pytestify slycot_convert_test.py

* pytestify statefbk tests

* pytestify statesp tests

* pytestify timeresp_test.py

* pytestify xferfcn_input_test.py

remove a lot of duplicate code by converting everything into
a single parametrized test function.

* pytestify xferfcn tests

* make tests work with pre python-control#431 source code state

revert this commit when merging a rebased python-control#431

(remove statesp_test.py::test_copy_constructor_nodt if not applicable)
@bnavigator
deprecate np.matrix usage (python-control#486)
ec42737
* deprecate np.matrix usage

* print pytest summary for all except passing
@murrayrm
reduce Python 3 testing to speed up CI (python-control#487)
d66f4e4
@bnavigator
Fix loading of defaults during pytest fixture setup
abf1565
Also make matarrayout and matarrayin function scoped fixtures so
that they can set the warnings filters individually as needed for
each test.
@bnavigator
Revert "make tests work with pre python-control#431 source code state…
578cfa6
…" from python-control#438

This reverts commit 2b98769.
@sawyerbfuller @bnavigator
set default dt to be 0 instead of None.
86401d6
@sawyerbfuller @bnavigator
changes so that a default dt=0 passes unit tests. fixed code everywhe…
1ed9ee2
…re that combines systems with different timebases
@sawyerbfuller @bnavigator
small bugfix to xferfcn._evalfr to correctly give it dt value
5f46b5b
@sawyerbfuller @bnavigator
re-incorporated lti.timebaseEqual, with a pendingDeprecationWarning
24eeb75
@sawyerbfuller @bnavigator
changes to enable package-wide default, 'control.default_dt')
0223b82
@sawyerbfuller @bnavigator
fixes to docstrings and conventions.rst to match convention of dt=0 a…
1ca9dec
…s default system timebase
@sawyerbfuller @bnavigator
remove extraneous file
3b2ab18
murrayrm and others added 18 commits December 31, 2020 21:11
@murrayrm
allow naming of linearized system signals
fa041b6
@murrayrm
PEP8 cleanup
4f08382
@murrayrm
append _linearize for system name + unit tests
e343a33
@bnavigator
error on matrix warning
aacb648
@bnavigator
move StateSpace generation into test function
7e852fd
@murrayrm
add keyword to geterate strictly proper rss systems
50e61a0
@murrayrm
update docs, tests for InterconnectedSystem + small refactoring of ga…
4e46c4a
…in parsing
@murrayrm
create LinearInterconnectedSystems for interconnections of linear sys…
da04036
…tems
@murrayrm
turn off selected unit tests for scipy-0.19
ff4a351
@murrayrm
implementation of initial_phase, wrap_phase keywords for bode() (pyth…
5125ff7
…on-control#494)

* implementation of initial_phase, wrap_phase keywords for bode()

* add additional documentation on initial_phase if deg=False

* clear figure in unit tests to avoid slow plotting problem
@murrayrm
updated sphinx documentation + changed to LinearICSystem
4f04f48
@murrayrm
allow default linearized system name to be customized
14fc96e
@murrayrm
fix bug in iosys unit test (reset_defaults)
e767986
@murrayrm
Merge pull request python-control#496 from bnavigator/matrix-warnings
8f5d8e5
TST: Error on Numpy matrix warnings
@murrayrm
use editdefaults fixture and matrixfilter mark for unit testing
488edf5
@murrayrm
fix issue with np.matrix deprecation in iosys_test.py
5ed0f96
@murrayrm
Merge pull request python-control#497 from murrayrm/linearize_named_s…
4103688
…ignals

I/O system improvements: linearize, interconnect, docstrings
@murrayrm
rebase sawyerbfuller-call-method against master
195bec3
@murrayrm murrayrm mentioned this pull request Jan 6, 2021
use __call__ instead of evalfr in lti system classes python-control/python-control#449
Merged
@sawyerbfuller

sawyerbfuller commented Jan 6, 2021

Copy link
Copy Markdown
Owner

looking thrugh it now. anything in particular you remember as needng attention/merge conflicts? also: wont be able to run pytest on this - does it pass tests? (hurt my hand so wont be coding for a few weeks)

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@murrayrm

murrayrm commented Jan 6, 2021

Copy link
Copy Markdown
Author

This passes all the unit tests.

There were some fairly substantial changes in margins.py that it would be good to check. I think the rest of it was pretty straightforward.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@sawyerbfuller

sawyerbfuller commented Jan 6, 2021

Copy link
Copy Markdown
Owner

i see them now, from @bnavigator's updates for DT margin calculations. They look good to me.

how do you want to do this? should merge this pull request?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@murrayrm

murrayrm commented Jan 6, 2021

Copy link
Copy Markdown
Author

If everything looks OK to you, you can merge this PR into your repository, which should automatically map things over to the PR on python-control/python-control. From there, we can confirm that unit tests work and then merge that PR into the master branch.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bnavigator

bnavigator commented Jan 6, 2021 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown

Careful! The base branch of this PR is sawyerbfuller:master not the branch for python-control#449
sawyerbfuller:call-method

(I did not have time yet to review.)

The diff here does not display the real change but all the differences between past and current master. Should be possible to compare 195bec3 vs https://github.com/python-control/python-control/pull/449/files for review (will do it later today) and then either merge into sawyerbfuller:call-method (which will create some convoluted tree lines in the git history) or reset sawyerbfuller:call-method to 195bec3 (which will lose the commit history)

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@murrayrm

murrayrm commented Jan 6, 2021

Copy link
Copy Markdown
Author

Oops. Sorry about that! I'm going to kill this PR and regenerate one that uses the correct branch.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@murrayrm murrayrm closed this Jan 6, 2021
@bnavigator

bnavigator commented Jan 6, 2021

Copy link
Copy Markdown

You can edit the base branch

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bnavigator bnavigator mentioned this pull request Jan 6, 2021
REBASE: use __call__ instead of evalfr in lti system classes python-control/python-control#499
Closed
@bnavigator

bnavigator commented Jan 6, 2021

Copy link
Copy Markdown

Review comments in python-control#499

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@murrayrm
murrayrm deleted the call-method_rebase branch January 14, 2021 07:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@murrayrm @sawyerbfuller @bnavigator @roryyorke
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.