Skip to content

Commit 451d6d2

Browse files
murrayrmmurrayrm
committed
change control.squeeze to control.squeeze_frequency_response
1 parent f367cf6 commit 451d6d2

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎control/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Package level default values
1717
_control_defaults = {
1818
'control.default_dt': 0,
19-
'control.squeeze': True
19+
'control.squeeze_frequency_response': True
2020
}
2121
defaults = dict(_control_defaults)
2222

‎control/frdata.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ def eval(self, omega, squeeze=None):
358358
squeeze : bool, optional (default=True)
359359
If True and the system is single-input single-output (SISO),
360360
return a 1D array rather than a 3D array. Default value (True)
361-
set by config.defaults['control.squeeze'].
361+
set by config.defaults['control.squeeze_frequency_response'].
362362
363363
Returns
364364
-------
@@ -369,7 +369,7 @@ def eval(self, omega, squeeze=None):
369369
"""
370370
# Set value of squeeze argument if not set
371371
if squeeze is None:
372-
squeeze = config.defaults['control.squeeze']
372+
squeeze = config.defaults['control.squeeze_frequency_response']
373373

374374
omega_array = np.array(omega, ndmin=1) # array-like version of omega
375375
if any(omega_array.imag > 0):
@@ -411,7 +411,7 @@ def __call__(self, s, squeeze=None):
411411
squeeze : bool, optional (default=True)
412412
If True and the system is single-input single-output (SISO),
413413
return a 1D array rather than a 3D array. Default value (True)
414-
set by config.defaults['control.squeeze'].
414+
set by config.defaults['control.squeeze_frequency_response'].
415415
416416
Returns
417417
-------
@@ -429,7 +429,7 @@ def __call__(self, s, squeeze=None):
429429
"""
430430
# Set value of squeeze argument if not set
431431
if squeeze is None:
432-
squeeze = config.defaults['control.squeeze']
432+
squeeze = config.defaults['control.squeeze_frequency_response']
433433

434434
if any(abs(np.array(s, ndmin=1).real) > 0):
435435
raise ValueError("__call__: FRD systems can only accept "

‎control/lti.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def frequency_response(self, omega, squeeze=None):
137137
squeeze : bool, optional
138138
If True and the system is single-input single-output (SISO),
139139
return a 1D array rather than a 3D array. Default value (True)
140-
set by config.defaults['control.squeeze'].
140+
set by config.defaults['control.squeeze_frequency_response'].
141141
142142
Returns
143143
-------
@@ -487,7 +487,7 @@ def evalfr(sys, x, squeeze=None):
487487
squeeze : bool, optional (default=True)
488488
If True and the system is single-input single-output (SISO), return a
489489
1D array rather than a 3D array. Default value (True) set by
490-
config.defaults['control.squeeze'].
490+
config.defaults['control.squeeze_frequency_response'].
491491
492492
Returns
493493
-------
@@ -535,7 +535,7 @@ def freqresp(sys, omega, squeeze=None):
535535
squeeze : bool, optional (default=True)
536536
If True and the system is single-input single-output (SISO), return a
537537
1D array rather than a 3D array. Default value (True) set by
538-
config.defaults['control.squeeze'].
538+
config.defaults['control.squeeze_frequency_response'].
539539
540540
Returns
541541
-------
@@ -607,7 +607,7 @@ def _process_frequency_response(sys, omega, out, squeeze=None):
607607

608608
# Get rid of unneeded dimensions
609609
if squeeze is None:
610-
squeeze = config.defaults['control.squeeze']
610+
squeeze = config.defaults['control.squeeze_frequency_response']
611611
if squeeze and sys.issiso():
612612
return out[0][0]
613613
else:

‎control/statesp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ def __call__(self, x, squeeze=None):
662662
squeeze : bool, optional
663663
If True and the system is single-input single-output (SISO),
664664
return a 1D array rather than a 3D array. Default value (True)
665-
set by config.defaults['control.squeeze'].
665+
set by config.defaults['control.squeeze_frequency_response'].
666666
667667
Returns
668668
-------

‎control/tests/lti_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def test_isdtime(self, objfun, arg, dt, ref, strictref):
157157
assert isctime(obj, strict=True) == strictref
158158

159159
@pytest.mark.usefixtures("editsdefaults")
160-
@pytest.mark.parametrize("fcn", [ct.ss, ct.tf, ct.frd])
160+
@pytest.mark.parametrize("fcn", [ct.ss, ct.tf, ct.frd, ct.ss2io])
161161
@pytest.mark.parametrize("nstate, nout, ninp, squeeze, shape", [
162162
[1, 1, 1, None, (8,)], # SISO
163163
[2, 1, 1, True, (8,)],
@@ -193,7 +193,7 @@ def test_squeeze(self, fcn, nstate, nout, ninp, squeeze, shape):
193193
assert ct.evalfr(sys, omega * 1j, squeeze=squeeze).shape == shape
194194

195195
# Changing config.default to False should return 3D frequency response
196-
ct.config.set_defaults('control', squeeze=False)
196+
ct.config.set_defaults('control', squeeze_frequency_response=False)
197197
mag, phase, _ = sys.frequency_response(omega)
198198
assert mag.shape == (sys.outputs, sys.inputs, 8)
199199
assert phase.shape == (sys.outputs, sys.inputs, 8)

‎control/xferfcn.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def __call__(self, x, squeeze=None):
256256
squeeze : bool, optional (default=True)
257257
If True and the system is single-input single-output (SISO),
258258
return a 1D array rather than a 3D array. Default value (True)
259-
set by config.defaults['control.squeeze'].
259+
set by config.defaults['control.squeeze_frequency_response'].
260260
261261
Returns
262262
-------

0 commit comments

Comments
 (0)