Changeset 2548

Timestamp:

Mar 15, 2006, 12:14:12 PM (19 years ago)

Author:

ole

Message:

A few more fixes towards numpy

Location:

inundation-numpy-branch/utilities

Files:

• numerical_tools.py (modified) (1 diff)
• polygon.py (modified) (1 diff)
• test_polygon.py (modified) (1 diff)

inundation-numpy-branch/utilities/numerical_tools.py

@@ -4 +4 @@
 """
 
-
-#Establish which Numeric package to use
-#(this should move to somewhere central)
-try:
-    from numpy import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
-except:
-    print 'Could not find numpy - using Numeric'
-    from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
+from numpy import ArrayType, array, sum, innerproduct, ravel, sqrt
+from numpy import searchsorted, sort, concatenate    
     
 

inundation-numpy-branch/utilities/polygon.py

@@ -4 +4 @@
 """
 
-
-try:
-    from scipy import Float, Int, zeros, ones, array, concatenate, reshape, dot
-except:
-    print 'Could not find scipy - using Numeric'
-    from Numeric import Float, Int, zeros, ones, array, concatenate, reshape, dot
-    
-
+from numpy import Float, Int, zeros, ones, array, concatenate, reshape, dot
 from math import sqrt
+
 from utilities.numerical_tools import ensure_numeric
 

inundation-numpy-branch/utilities/test_polygon.py

@@ -3 +3 @@
 
 import unittest
-from Numeric import zeros, array, allclose
+from numpy import zeros, array, allclose
 from math import sqrt, pi