@@ -231,116 +231,117 @@ def testisctime(self, tsys):
231231
232232 def testAddition (self , tsys ):
233233 # State space addition
234- sys = tsys .siso_ss1 + tsys .siso_ss1d
235- sys = tsys .siso_ss1 + tsys .siso_ss1c
236- sys = tsys .siso_ss1c + tsys .siso_ss1
237- sys = tsys .siso_ss1d + tsys .siso_ss1
238- sys = tsys .siso_ss1c + tsys .siso_ss1c
239- sys = tsys .siso_ss1d + tsys .siso_ss1d
240- sys = tsys .siso_ss3d + tsys .siso_ss3d
241- sys = tsys .siso_ss1d + tsys .siso_ss3d
234+ _sys = tsys .siso_ss1 + tsys .siso_ss1d
235+ _sys = tsys .siso_ss1 + tsys .siso_ss1c
236+ _sys = tsys .siso_ss1c + tsys .siso_ss1
237+ _sys = tsys .siso_ss1d + tsys .siso_ss1
238+ _sys = tsys .siso_ss1c + tsys .siso_ss1c
239+ _sys = tsys .siso_ss1d + tsys .siso_ss1d
240+ _sys = tsys .siso_ss3d + tsys .siso_ss3d
241+ _sys = tsys .siso_ss1d + tsys .siso_ss3d
242242
243243 with pytest .raises (ValueError ):
244244 StateSpace .__add__ (tsys .mimo_ss1c , tsys .mimo_ss1d )
245245 with pytest .raises (ValueError ):
246246 StateSpace .__add__ (tsys .mimo_ss1d , tsys .mimo_ss2d )
247247
248248 # Transfer function addition
249- sys = tsys .siso_tf1 + tsys .siso_tf1d
250- sys = tsys .siso_tf1 + tsys .siso_tf1c
251- sys = tsys .siso_tf1c + tsys .siso_tf1
252- sys = tsys .siso_tf1d + tsys .siso_tf1
253- sys = tsys .siso_tf1c + tsys .siso_tf1c
254- sys = tsys .siso_tf1d + tsys .siso_tf1d
255- sys = tsys .siso_tf2d + tsys .siso_tf2d
256- sys = tsys .siso_tf1d + tsys .siso_tf3d
249+ _sys = tsys .siso_tf1 + tsys .siso_tf1d
250+ _sys = tsys .siso_tf1 + tsys .siso_tf1c
251+ _sys = tsys .siso_tf1c + tsys .siso_tf1
252+ _sys = tsys .siso_tf1d + tsys .siso_tf1
253+ _sys = tsys .siso_tf1c + tsys .siso_tf1c
254+ _sys = tsys .siso_tf1d + tsys .siso_tf1d
255+ _sys = tsys .siso_tf2d + tsys .siso_tf2d
256+ _sys = tsys .siso_tf1d + tsys .siso_tf3d
257257
258258 with pytest .raises (ValueError ):
259259 TransferFunction .__add__ (tsys .siso_tf1c , tsys .siso_tf1d )
260260 with pytest .raises (ValueError ):
261261 TransferFunction .__add__ (tsys .siso_tf1d , tsys .siso_tf2d )
262262
263263 # State space + transfer function
264- sys = tsys .siso_ss1c + tsys .siso_tf1c
265- sys = tsys .siso_tf1c + tsys .siso_ss1c
266- sys = tsys .siso_ss1d + tsys .siso_tf1d
267- sys = tsys .siso_tf1d + tsys .siso_ss1d
264+ _sys = tsys .siso_ss1c + tsys .siso_tf1c
265+ _sys = tsys .siso_tf1c + tsys .siso_ss1c
266+ _sys = tsys .siso_ss1d + tsys .siso_tf1d
267+ _sys = tsys .siso_tf1d + tsys .siso_ss1d
268268 with pytest .raises (ValueError ):
269269 TransferFunction .__add__ (tsys .siso_tf1c , tsys .siso_ss1d )
270270
271271 def testMultiplication (self , tsys ):
272272 # State space multiplication
273- sys = tsys .siso_ss1 * tsys .siso_ss1d
274- sys = tsys .siso_ss1 * tsys .siso_ss1c
275- sys = tsys .siso_ss1c * tsys .siso_ss1
276- sys = tsys .siso_ss1d * tsys .siso_ss1
277- sys = tsys .siso_ss1c * tsys .siso_ss1c
278- sys = tsys .siso_ss1d * tsys .siso_ss1d
279- sys = tsys .siso_ss1d * tsys .siso_ss3d
273+ _sys = tsys .siso_ss1 * tsys .siso_ss1d
274+ _sys = tsys .siso_ss1 * tsys .siso_ss1c
275+ _sys = tsys .siso_ss1c * tsys .siso_ss1
276+ _sys = tsys .siso_ss1d * tsys .siso_ss1
277+ _sys = tsys .siso_ss1c * tsys .siso_ss1c
278+ _sys = tsys .siso_ss1d * tsys .siso_ss1d
279+ _sys = tsys .siso_ss1d * tsys .siso_ss3d
280280
281281 with pytest .raises (ValueError ):
282282 StateSpace .__mul__ (tsys .mimo_ss1c , tsys .mimo_ss1d )
283283 with pytest .raises (ValueError ):
284284 StateSpace .__mul__ (tsys .mimo_ss1d , tsys .mimo_ss2d )
285285
286286 # Transfer function multiplication
287- sys = tsys .siso_tf1 * tsys .siso_tf1d
288- sys = tsys .siso_tf1 * tsys .siso_tf1c
289- sys = tsys .siso_tf1c * tsys .siso_tf1
290- sys = tsys .siso_tf1d * tsys .siso_tf1
291- sys = tsys .siso_tf1c * tsys .siso_tf1c
292- sys = tsys .siso_tf1d * tsys .siso_tf1d
293- sys = tsys .siso_tf1d * tsys .siso_tf3d
287+ _sys = tsys .siso_tf1 * tsys .siso_tf1d
288+ _sys = tsys .siso_tf1 * tsys .siso_tf1c
289+ _sys = tsys .siso_tf1c * tsys .siso_tf1
290+ _sys = tsys .siso_tf1d * tsys .siso_tf1
291+ _sys = tsys .siso_tf1c * tsys .siso_tf1c
292+ _sys = tsys .siso_tf1d * tsys .siso_tf1d
293+ _sys = tsys .siso_tf1d * tsys .siso_tf3d
294294
295295 with pytest .raises (ValueError ):
296296 TransferFunction .__mul__ (tsys .siso_tf1c , tsys .siso_tf1d )
297297 with pytest .raises (ValueError ):
298298 TransferFunction .__mul__ (tsys .siso_tf1d , tsys .siso_tf2d )
299299
300300 # State space * transfer function
301- sys = tsys .siso_ss1c * tsys .siso_tf1c
302- sys = tsys .siso_tf1c * tsys .siso_ss1c
303- sys = tsys .siso_ss1d * tsys .siso_tf1d
304- sys = tsys .siso_tf1d * tsys .siso_ss1d
301+ _sys = tsys .siso_ss1c * tsys .siso_tf1c
302+ _sys = tsys .siso_tf1c * tsys .siso_ss1c
303+ _sys = tsys .siso_ss1d * tsys .siso_tf1d
304+ _sys = tsys .siso_tf1d * tsys .siso_ss1d
305305 with pytest .raises (ValueError ):
306306 TransferFunction .__mul__ (tsys .siso_tf1c ,
307307 tsys .siso_ss1d )
308308
309309
310310 def testFeedback (self , tsys ):
311311 # State space feedback
312- sys = feedback (tsys .siso_ss1 , tsys .siso_ss1d )
313- sys = feedback (tsys .siso_ss1 , tsys .siso_ss1c )
314- sys = feedback (tsys .siso_ss1c , tsys .siso_ss1 )
315- sys = feedback (tsys .siso_ss1d , tsys .siso_ss1 )
316- sys = feedback (tsys .siso_ss1c , tsys .siso_ss1c )
317- sys = feedback (tsys .siso_ss1d , tsys .siso_ss1d )
318- sys = feedback (tsys .siso_ss1d , tsys .siso_ss3d )
312+ _sys = feedback (tsys .siso_ss1 , tsys .siso_ss1d )
313+ _sys = feedback (tsys .siso_ss1 , tsys .siso_ss1c )
314+ _sys = feedback (tsys .siso_ss1c , tsys .siso_ss1 )
315+ _sys = feedback (tsys .siso_ss1d , tsys .siso_ss1 )
316+ _sys = feedback (tsys .siso_ss1c , tsys .siso_ss1c )
317+ _sys = feedback (tsys .siso_ss1d , tsys .siso_ss1d )
318+ _sys = feedback (tsys .siso_ss1d , tsys .siso_ss3d )
319319
320320 with pytest .raises (ValueError ):
321321 feedback (tsys .mimo_ss1c , tsys .mimo_ss1d )
322322 with pytest .raises (ValueError ):
323323 feedback (tsys .mimo_ss1d , tsys .mimo_ss2d )
324324
325325 # Transfer function feedback
326- sys = feedback (tsys .siso_tf1 , tsys .siso_tf1d )
327- sys = feedback (tsys .siso_tf1 , tsys .siso_tf1c )
328- sys = feedback (tsys .siso_tf1c , tsys .siso_tf1 )
329- sys = feedback (tsys .siso_tf1d , tsys .siso_tf1 )
330- sys = feedback (tsys .siso_tf1c , tsys .siso_tf1c )
331- sys = feedback (tsys .siso_tf1d , tsys .siso_tf1d )
332- sys = feedback (tsys .siso_tf1d , tsys .siso_tf3d )
326+ _sys = feedback (tsys .siso_tf1 , tsys .siso_tf1d )
327+ _sys = feedback (tsys .siso_tf1 , tsys .siso_tf1c )
328+ _sys = feedback (tsys .siso_tf1c , tsys .siso_tf1 )
329+ _sys = feedback (tsys .siso_tf1d , tsys .siso_tf1 )
330+ _sys = feedback (tsys .siso_tf1c , tsys .siso_tf1c )
331+ _sys = feedback (tsys .siso_tf1d , tsys .siso_tf1d )
332+ _sys = feedback (tsys .siso_tf1d , tsys .siso_tf3d )
333333
334334 with pytest .raises (ValueError ):
335335 feedback (tsys .siso_tf1c , tsys .siso_tf1d )
336336 with pytest .raises (ValueError ):
337337 feedback (tsys .siso_tf1d , tsys .siso_tf2d )
338338
339339 # State space, transfer function
340- sys = feedback (tsys .siso_ss1c , tsys .siso_tf1c )
341- sys = feedback (tsys .siso_tf1c , tsys .siso_ss1c )
342- sys = feedback (tsys .siso_ss1d , tsys .siso_tf1d )
343- sys = feedback (tsys .siso_tf1d , tsys .siso_ss1d )
340+ _sys = feedback (tsys .siso_ss1c , tsys .siso_tf1c )
341+ _sys = feedback (tsys .siso_tf1c , tsys .siso_ss1c )
342+ _sys = feedback (tsys .siso_ss1d , tsys .siso_tf1d )
343+
344+ _sys = feedback (tsys .siso_tf1d , tsys .siso_ss1d )
344345 with pytest .raises (ValueError ):
345346 feedback (tsys .siso_tf1c , tsys .siso_ss1d )
346347
@@ -416,11 +417,11 @@ def test_sample_system_prewarp_warning(self, tsys, plantname, discretization_typ
416417 wwarp = 1
417418 Ts = 0.1
418419 with pytest .warns (UserWarning , match = "prewarp_frequency ignored: incompatible conversion" ):
419- plant_d_warped = plant .sample (Ts , discretization_type , prewarp_frequency = wwarp )
420+ plant .sample (Ts , discretization_type , prewarp_frequency = wwarp )
420421 with pytest .warns (UserWarning , match = "prewarp_frequency ignored: incompatible conversion" ):
421- plant_d_warped = sample_system (plant , Ts , discretization_type , prewarp_frequency = wwarp )
422+ sample_system (plant , Ts , discretization_type , prewarp_frequency = wwarp )
422423 with pytest .warns (UserWarning , match = "prewarp_frequency ignored: incompatible conversion" ):
423- plant_d_warped = c2d (plant , Ts , discretization_type , prewarp_frequency = wwarp )
424+ c2d (plant , Ts , discretization_type , prewarp_frequency = wwarp )
424425
425426 def test_sample_system_errors (self , tsys ):
426427 # Check errors
0 commit comments