From fae8e6dd7192e9a08998c5434265077b36a2111d Mon Sep 17 00:00:00 2001 From: "Joseph C. Slater" Date: Sun, 4 Oct 2020 19:50:37 -0500 Subject: [PATCH 1/5] Update nichols.py --- control/nichols.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control/nichols.py b/control/nichols.py index 164251a5f..044376c54 100644 --- a/control/nichols.py +++ b/control/nichols.py @@ -251,7 +251,7 @@ def m_circles(mags, phase_min=-359.75, phase_max=-0.25): """ # Convert magnitudes and phase range into a grid suitable for # building contours - phases = sp.radians(sp.linspace(phase_min, phase_max, 2000)) + phases = sp.radians(np.linspace(phase_min, phase_max, 2000)) Gcl_mags, Gcl_phases = sp.meshgrid(10.0**(mags/20.0), phases) return closed_loop_contours(Gcl_mags, Gcl_phases) @@ -277,7 +277,7 @@ def n_circles(phases, mag_min=-40.0, mag_max=12.0): """ # Convert phases and magnitude range into a grid suitable for # building contours - mags = sp.linspace(10**(mag_min/20.0), 10**(mag_max/20.0), 2000) + mags = np.linspace(10**(mag_min/20.0), 10**(mag_max/20.0), 2000) Gcl_phases, Gcl_mags = sp.meshgrid(sp.radians(phases), mags) return closed_loop_contours(Gcl_mags, Gcl_phases) From 9e2bc60ed5451b220d0e1913f5ca0677980e88ce Mon Sep 17 00:00:00 2001 From: "Joseph C. Slater" Date: Sun, 4 Oct 2020 19:50:48 -0500 Subject: [PATCH 2/5] Update bdalg.py --- control/bdalg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control/bdalg.py b/control/bdalg.py index 9d5aac654..2dfa179ab 100644 --- a/control/bdalg.py +++ b/control/bdalg.py @@ -321,7 +321,7 @@ def connect(sys, Q, inputv, outputv): ''' # first connect K = sp.zeros( (sys.inputs, sys.outputs) ) - for r in sp.array(Q).astype(int): + for r in np.array(Q).astype(int): inp = r[0]-1 for outp in r[1:]: if outp > 0 and outp <= sys.outputs: From 68870368a6e093ee6c59c8bbedaa264db8fd8140 Mon Sep 17 00:00:00 2001 From: "Joseph C. Slater" Date: Sun, 15 Nov 2020 08:33:50 -0600 Subject: [PATCH 3/5] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0262ab46f..c9267a9da 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ Untitled*.ipynb # Files created by or for emacs (RMM, 29 Dec 2017) *~ TAGS +.DS_Store From 1ce3c8151e63db5dbdabead85279e1115f2e5c11 Mon Sep 17 00:00:00 2001 From: "Joseph C. Slater" Date: Thu, 19 Nov 2020 14:55:15 -0600 Subject: [PATCH 4/5] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 6b6706ca6..c8e76134c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2009-2016 by California Institute of Technology + Copyright (c) 2009-2016 by California Institute of Technology All rights reserved. Redistribution and use in source and binary forms, with or without From a6cfc93df74a213137fa47e0df8f2215aa778991 Mon Sep 17 00:00:00 2001 From: "Joseph C. Slater" Date: Thu, 19 Nov 2020 14:57:00 -0600 Subject: [PATCH 5/5] Revert "Update LICENSE" This reverts commit 1ce3c8151e63db5dbdabead85279e1115f2e5c11. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c8e76134c..6b6706ca6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ - Copyright (c) 2009-2016 by California Institute of Technology +Copyright (c) 2009-2016 by California Institute of Technology All rights reserved. Redistribution and use in source and binary forms, with or without