Merge pull request #136 from tinosulzer/remove-alen

remove alen from imports
bmcage · Jun 24, 2022 · 290334c · 290334c
2 parents 269e149 + 862f076
commit 290334c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 36 deletions.
diff --git a/docs/examples/ddaspk/planarpendulum_ddaspk.py b/docs/examples/ddaspk/planarpendulum_ddaspk.py
@@ -40,7 +40,7 @@
 #python 2.7 support
 from __future__ import print_function, division
 
-from numpy import (arange, zeros, array, sin, empty, alen)
+from numpy import (arange, zeros, array, sin, empty)
 from scikits.odes import dae
 import pylab
 
@@ -69,8 +69,8 @@ def res(self, t, x, xdot, tmp):
                     - (x[0]**2 + x[1]**2)*x[4] - x[1] * PlanarPendulum.g
 
 problem = PlanarPendulum()
-z = empty((1+len(problem.stop_t), alen(problem.z0)), float)
-zprime = empty((1+len(problem.stop_t), alen(problem.z0)), float)
+z = empty((1+len(problem.stop_t), len(problem.z0)), float)
+zprime = empty((1+len(problem.stop_t), len(problem.z0)), float)
 algvar = -1
 
 ig = dae('ddaspk', problem.res)

diff --git a/docs/examples/doublependulum.py b/docs/examples/doublependulum.py
@@ -64,8 +64,7 @@
 
 #imports
 import numpy as np
-from numpy import (arange, zeros, array, sin, cos, asarray, sqrt, pi, empty,
-                    alen)
+from numpy import (arange, zeros, array, sin, cos, asarray, sqrt, pi, empty)
 from scikits.odes.sundials import ida
 from scikits.odes import dae
 import pylab
@@ -382,8 +381,8 @@ def main():
 
     #solve the same with ddaspk
     if alsoddaspk:
-        ddaspkz = empty((alen(problem.stop_t), problem.neq), float)
-        ddaspkzprime = empty((alen(problem.stop_t), problem.neq), float)
+        ddaspkz = empty((len(problem.stop_t), problem.neq), float)
+        ddaspkzprime = empty((len(problem.stop_t), problem.neq), float)
 
         problem.set_res(res)
         ig = dae('ddaspk', problem.ddaspk_res)

diff --git a/ipython_examples/Double Pendulum as DAE with roots.ipynb b/ipython_examples/Double Pendulum as DAE with roots.ipynb
diff --git a/scikits/odes/dae.py b/scikits/odes/dae.py
@@ -28,7 +28,7 @@
 __version__ = "$Id$"
 __docformat__ = "restructuredtext en"
 
-from numpy import asarray, array, zeros, sin, int32, isscalar, empty, alen
+from numpy import asarray, array, zeros, sin, int32, isscalar, empty
 from copy import copy
 import re, sys
 

diff --git a/scikits/odes/ddaspkint.py b/scikits/odes/ddaspkint.py
@@ -115,7 +115,7 @@
 __version__ = "$Id$"
 __docformat__ = "restructuredtext en"
 
-from numpy import asarray, array, zeros, sin, int32, isscalar, empty, alen
+from numpy import asarray, array, zeros, sin, int32, isscalar, empty
 from copy import copy
 from .dae import DaeBase
 import re, sys
@@ -386,12 +386,12 @@ def solve(self, tspan, y0,  yp0, hook_fn = None):
         """ See dae.DaeBase
         """
 
-        t_retn  = empty([alen(tspan), ], float)
-        y_retn  = empty([alen(tspan), alen(y0)], float)
-        yp_retn = empty([alen(tspan), alen(y0)], float)
+        t_retn  = empty([len(tspan), ], float)
+        y_retn  = empty([len(tspan), len(y0)], float)
+        yp_retn = empty([len(tspan), len(y0)], float)
 
-        y_ic0_retn  = empty(alen(y0), float)
-        yp_ic0_retn  = empty(alen(y0), float)
+        y_ic0_retn  = empty(len(y0), float)
+        yp_ic0_retn  = empty(len(y0), float)
         tinit = self.init_step(tspan[0], y0, yp0, y_ic0_retn, yp_ic0_retn)
 
         t_retn[0] = tinit

diff --git a/scikits/odes/lsodiint.py b/scikits/odes/lsodiint.py
@@ -78,7 +78,7 @@ def adda(t, y, ml, mu, p, nrowp):
 __version__ = "$Id$"
 __docformat__ = "restructuredtext en"
 
-from numpy import asarray, array, zeros, sin, int32, isscalar, empty, alen
+from numpy import asarray, array, zeros, sin, int32, isscalar, empty
 from copy import copy
 from .dae import DaeBase
 import re, sys
@@ -289,12 +289,12 @@ def solve(self, tspan, y0, yp0, hook_fn = None):
         """ See dae.DaeBase
         """
 
-        t_retn = empty([alen(tspan), ], float)
-        y_retn = empty([alen(tspan), alen(y0)], float)
-        yp_retn = empty([alen(tspan), alen(y0)], float)
+        t_retn = empty([len(tspan), ], float)
+        y_retn = empty([len(tspan), len(y0)], float)
+        yp_retn = empty([len(tspan), len(y0)], float)
 
-        y_ic0_retn = empty(alen(y0), float)
-        yp_ic0_retn = empty(alen(y0), float)
+        y_ic0_retn = empty(len(y0), float)
+        yp_ic0_retn = empty(len(y0), float)
         tinit = self.init_step(tspan[0], y0, yp0, y_ic0_retn, yp_ic0_retn)
 
         t_retn[0] = tinit

diff --git a/scikits/odes/tests/test_on_funcs.py b/scikits/odes/tests/test_on_funcs.py
@@ -8,7 +8,7 @@
 import numpy as np
 
 from numpy import (arange, zeros, array, dot, sqrt, cos, sin, allclose,
-                    empty, alen)
+                    empty)
 
 from numpy.testing import TestCase, run_module_suite
 

diff --git a/scikits/odes/tests/test_on_funcs_ida.py b/scikits/odes/tests/test_on_funcs_ida.py
@@ -8,7 +8,7 @@
 import numpy as np
 
 from numpy import (arange, zeros, array, dot, sqrt, cos, sin, allclose,
-                    empty, alen)
+                    empty)
 
 from numpy.testing import TestCase, run_module_suite