Changeset 2548


Ignore:
Timestamp:
Mar 15, 2006, 12:14:12 PM (18 years ago)
Author:
ole
Message:

A few more fixes towards numpy

Location:
inundation-numpy-branch/utilities
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • inundation-numpy-branch/utilities/numerical_tools.py

    r2545 r2548  
    44"""
    55
    6 
    7 #Establish which Numeric package to use
    8 #(this should move to somewhere central)
    9 try:
    10     from numpy import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate   
    11 except:
    12     print 'Could not find numpy - using Numeric'
    13     from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate   
     6from numpy import ArrayType, array, sum, innerproduct, ravel, sqrt
     7from numpy import searchsorted, sort, concatenate   
    148   
    159
  • inundation-numpy-branch/utilities/polygon.py

    r2531 r2548  
    44"""
    55
    6 
    7 try:
    8     from scipy import Float, Int, zeros, ones, array, concatenate, reshape, dot
    9 except:
    10     print 'Could not find scipy - using Numeric'
    11     from Numeric import Float, Int, zeros, ones, array, concatenate, reshape, dot
    12    
    13 
     6from numpy import Float, Int, zeros, ones, array, concatenate, reshape, dot
    147from math import sqrt
     8
    159from utilities.numerical_tools import ensure_numeric
    1610
  • inundation-numpy-branch/utilities/test_polygon.py

    r2442 r2548  
    33
    44import unittest
    5 from Numeric import zeros, array, allclose
     5from numpy import zeros, array, allclose
    66from math import sqrt, pi
    77
Note: See TracChangeset for help on using the changeset viewer.