Skip to content

Mergetest Prs #400 #431 #433 #1

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

Closed
bnavigator wants to merge 32 commits into from
Closed

Mergetest Prs #400 #431 #433 #1

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
672f229
Made sure interconnectedsystems keeps names of parts.
samlaf May 14, 2020
15a442a
Update control/iosys.py
samlaf May 18, 2020
77f9441
Update control/iosys.py
samlaf May 18, 2020
d45a6c0
Fixed signal names for InterconnectedSystems.
samlaf May 20, 2020
b688729
Merge branch 'interconnectedsystems' of https://github.com/samlaf/pyt…
samlaf May 20, 2020
c8fba97
Update control/iosys.py
samlaf Jul 15, 2020
bd38dea
Update control/iosys.py
samlaf Jul 15, 2020
35676f2
Fixed some naming convention problems and added unit tests for naming…
samlaf Jul 16, 2020
90705d4
Merge branch 'interconnectedsystems' of https://github.com/samlaf/pyt…
samlaf Jul 16, 2020
0113f99
set default dt to be 0 instead of None. Now need to fix resulting uni…
sawyerbfuller Jul 17, 2020
9aed7cc
changes so that a default dt=0 passes unit tests. fixed code everywhe…
sawyerbfuller Jul 17, 2020
7a9bcd4
small bugfix to xferfcn._evalfr to correctly give it dt value
sawyerbfuller Jul 18, 2020
d59e57a
removed a brittle unit test dependency that is already tested elsewhere
sawyerbfuller Jul 18, 2020
69cc8c5
Removed for loops from tests to get better error messages
samlaf Jul 19, 2020
e76a4f8
Update control/iosys.py
samlaf Jul 19, 2020
abb1f19
Changed a lot of naming convention code/unit test following pull-requ…
samlaf Jul 19, 2020
f955b3a
Merge branch 'interconnectedsystems' of https://github.com/samlaf/pyt…
samlaf Jul 19, 2020
3ec2f02
Fixed system naming conventions and unit tests. Still need to do sign…
samlaf Jul 19, 2020
8c957b2
Merge branch 'master' into interconnectedsystems
murrayrm Jul 20, 2020
c96465d
improved unit test suggestd by ben greiner
sawyerbfuller Jul 20, 2020
2ec1653
re-incorporated lti.timebaseEqual, with a pendingDeprecationWarning
sawyerbfuller Jul 20, 2020
1e001ee
changes to enable package-wide default, 'control.default_dt')
sawyerbfuller Jul 20, 2020
b2c8d44
Finished test_signals_naming_convention unit test
samlaf Jul 20, 2020
f5c3fac
fixes to docstrings and conventions.rst to match convention of dt=0 a…
sawyerbfuller Jul 20, 2020
c6787cc
remove extraneous file
sawyerbfuller Jul 21, 2020
606975d
new method is_static_gain() for state space and transfer function sys…
sawyerbfuller Jul 22, 2020
2bd912d
added keyword arguments to xferfcn.tf and statesp.ss to set dt
sawyerbfuller Jul 22, 2020
dc53eb9
unit tests for is_static_gain system method and dt keyword in system …
sawyerbfuller Jul 23, 2020
9da5295
Merge branch 'pr431' into mergetest-prs-400-431-433
bnavigator Jul 23, 2020
d1ac4bb
common_timebase will already raise
bnavigator Jul 23, 2020
e3ff725
Merge branch 'pr433' into mergetest-prs-400-431-433
bnavigator Jul 23, 2020
35f6202
Merge branch 'pr433' into merge-400-431-433-before438
bnavigator Jul 26, 2020
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
Update control/iosys.py 
Co-authored-by: Ben Greiner <code@bnavigator.de>
  • Loading branch information
@samlaf @bnavigator
samlaf and bnavigator authored Jul 15, 2020
commit bd38dea13f8aae265b256482b02d063e00f2f672
2 changes: 0 additions & 2 deletions control/iosys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,8 +956,6 @@ def __init__(self, syslist, connections=[], inplist=[], outlist=[],
self.input_map[self._parse_input_spec(spec), index] = 1

# Convert the output list to a matrix: maps subsystems to system
# why can subsystem inputs map to outputs? shouldn't it be
# system inputs (hence self.ninputs instead of ninputs)?
self.output_map = np.zeros((self.noutputs, noutputs + ninputs))
for index, outspec in enumerate(outlist):
if isinstance(outspec, (int, str, tuple)): outspec = [outspec]
Expand Down