removed some leftover code and comments

sawyerbfuller · sawyerbfuller · commit 512f822cef56 · 2020-06-21T14:41:00.000-07:00
diff --git a/control/tests/timeresp_test.py b/control/tests/timeresp_test.py
@@ -415,10 +415,6 @@ def test_auto_generated_time_vector(self):
             100, 
             initial_response(sys, 100)[0][-1], 
             decimal=.5)
-        
-        
-        # slow system max 
-        # to add: impose N, impose tfinal
 
 
     def test_time_vector(self):
diff --git a/control/timeresp.py b/control/timeresp.py
@@ -876,70 +876,4 @@ def _default_time_vector(sys, N=None, tfinal=None):
         if N is None:     
             N = int(np.clip(tfinal/ideal_dt, N_min_ct, N_max)) # N<-[N_min, N_max]
             
-    return np.linspace(0, tfinal, N, endpoint=False)
-
-def junk(sys, N, tfinal):
-    N_max = 5000
-    N_min = 10
-    if tfinal is None: 
-        ideal_tfinal, ideal_dt = _ideal_tfinal_and_dt(sys)
-        N = int(np.clip(ideal_tfinal/ideal_dt, N_min, N_max))# N->[N_min, N_max]
-        if isdtime(sys, strict=True):
-            # for discrete time, change tfinal if N gets too large/small
-            tfinal = sys.dt * N
-        else: 
-            # for continuous time, simulate to tfinal but change dt if N large
-            tfinal = ideal_tfinal
-    else: 
-        if isdtime(sys, strict=True):
-            N = int(tfinal/sys.dt)
-        else:
-            _, ideal_dt = _ideal_tfinal_and_dt(sys)
-            N = int(np.clip(tfinal/sys.dt, N_min, N_max)) # N->[N_min, N_max]
-            
-         
-    if isdtime(sys, strict=True):
-        if tfinal is None: 
-            tfinal, dt = _ideal_tfinal_and_dt(sys)
-            # sanity bounds on tfinal
-            N = int(np.clip(tfinal/sys.dt, N_min, N_max)) # [N_min, N_max]
-            tfinal = sys.dt * N
-        else:
-            N = int(tfinal/sys.dt)
-    else: 
-        if tfinal is None: 
-            tfinal, dt = _ideal_tfinal_and_dt(sys)
-        N = int(np.clip(tfinal/dt, N_min, N_max)) # [N_min, N_max]
-        dt = tfinal/N
-    return np.linspace(0, tfinal, N, endpoint=False)
-    
-    if 1: 
-        # run to N steps, or to ideal tfinal if N not given 
-        if N is None:
-            # run to tfinal
-            if tfinal is None: 
-                tfinal, dt = _ideal_tfinal_and_dt(sys)
-            N = int(np.clip(tfinal/sys.dt, N_min, N_max)) # [N_min, N_max]
-            tfinal = sys.dt * N
-        else: 
-            tfinal = sys.dt * N
-    else: 
-        # continuous-time 
-        ideal_tfinal, ideal_dt = _ideal_tfinal_and_dt(sys)
- 
-
-    # tfinal 
-    if tfinal is None: 
-        ideal_tfinal, ideal_dt = _ideal_tfinal_and_dt(sys)
-        
-    if N is None: 
-        ideal_tfinal, ideal_dt = _ideal_tfinal_and_dt(sys)
-        if tfinal is None: 
-            tfinal = ideal_tfinal 
-        N = int(np.clip(tfinal/dt, N_min, N_max)) # limit to [N_min, N_max]
-    if isdtime(sys, strict=True):
-        tfinal = sys.dt * N
-    else: 
-        dt = tfinal/N
-        return np.arange(0, tfinal, dt)
-        return np.linspace(0, tfinal, N, endpoint=False)
+    return np.linspace(0, tfinal, N, endpoint=False)
