Skip to content

Rebased #431: Default dt is 0 #490

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

Jump to bottom
Merged
merged 14 commits into from
Dec 31, 2020
Merged

Rebased #431: Default dt is 0 #490

merged 14 commits into from
Dec 31, 2020

Conversation

bnavigator
Copy link
Contributor

Rebased version of #431. I had the updated tests already prepared in earlier versions of #438

bnavigator and others added 10 commits December 31, 2020 00:34
@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
@sawyerbfuller @bnavigator
new method is_static_gain() for state space and transfer function sys…
351e0f7 
…tems, refactored __init__ on both to use it
@sawyerbfuller @bnavigator
added keyword arguments to xferfcn.tf and statesp.ss to set dt
e3a0070
This was linked to issues Dec 31, 2020
Problem with DT State-Space Response #419
Closed
use dt=0 instead of dt=None (unspecified timebase) as default option for lti systems? #422
Closed
Bugs in InterconnectedSystem: different dt's [fixed] and non-proper TFs [open] #399
Closed
@bnavigator bnavigator mentioned this pull request Dec 31, 2020
Closed
@coveralls
Copy link

coveralls commented Dec 31, 2020 •
edited
Loading

Coverage Status

Coverage increased (+0.3%) to 87.52% when pulling 75f3aef on bnavigator:rebase-pr431 into 6ed3f74 on python-control:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.04%) to 87.005% when pulling adc8166 on bnavigator:rebase-pr431 into d66f4e4 on python-control:master.

@bnavigator bnavigator changed the title Rebase pr431 Rebased #431: default dt is 0 Dec 31, 2020
@bnavigator bnavigator changed the title Rebased #431: default dt is 0 Rebased #431: Default dt is 0 Dec 31, 2020
murrayrm
murrayrm approved these changes Dec 31, 2020
View reviewed changes
Copy link
Member

@murrayrm murrayrm left a comment

Choose a reason for hiding this comment

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

I look through the changes and these look good to me.

@murrayrm murrayrm mentioned this pull request Dec 31, 2020
Closed
sawyerbfuller
sawyerbfuller reviewed Dec 31, 2020
View reviewed changes
control/tests/discrete_test.py
@@ -260,8 +258,6 @@ def testAddition(self, tsys):
TransferFunction.__add__(tsys.siso_tf1c, tsys.siso_tf1d)
with pytest.raises(ValueError):
TransferFunction.__add__(tsys.siso_tf1d, tsys.siso_tf2d)
with pytest.raises(ValueError):
Copy link
Contributor

Choose a reason for hiding this comment

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

I assume these are removed because these tests are already performed above in eg ‘test_timenase_conversion’?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They don't raise an error anymore. You had an equivalent change in #431. dt=0.1 and dt=True are compatible now.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see, makes sense!

sawyerbfuller
sawyerbfuller reviewed Dec 31, 2020
View reviewed changes
control/xferfcn.py
@@ -223,7 +223,7 @@ def __init__(self, *args, **kwargs):
# TODO: not sure this can ever happen since dt is always present
try:
dt = args[0].dt
except NameError: # pragma: no coverage
except AttributeError:
Copy link
Contributor

Choose a reason for hiding this comment

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

🤙

sawyerbfuller
sawyerbfuller approved these changes Dec 31, 2020
View reviewed changes
Copy link
Contributor

@sawyerbfuller sawyerbfuller left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good to me!

@bnavigator
Copy link
Contributor Author

Added one more simple test in order to not uncover a line. The double dt resolver is documented behavior and thus should be checked.

@bnavigator bnavigator merged commit d1502f4 into python-control:master Dec 31, 2020
This was referenced Dec 31, 2020
Closed
Merged
@bnavigator bnavigator deleted the rebase-pr431 branch January 5, 2021 20:13
@murrayrm murrayrm added this to the 0.9.0 milestone Mar 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sawyerbfuller sawyerbfuller sawyerbfuller approved these changes

@murrayrm murrayrm murrayrm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.9.0
4 participants
@bnavigator @coveralls @murrayrm @sawyerbfuller