Changeset 465


Ignore:
Timestamp:
Oct 29, 2004, 9:58:25 AM (20 years ago)
Author:
ole
Message:

Removed unnecesaary dependency on scipy

Location:
inundation/ga/storm_surge/pyvolution
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • inundation/ga/storm_surge/pyvolution/sparse.py

    r452 r465  
    11"""Proof of concept sparse matrix code
    22"""
    3 from scipy_base import *
     3#from scipy_base import *
    44from cg_solve import conjugate_gradient, VectorShapeError
    55
     
    125125        from Numeric import array, zeros, Float
    126126       
    127         if isscalar(other):
     127        try:
     128            float(other)
     129        except:
     130            raise 'only right multiple with scalar implemented'
     131        else:
    128132            new = self.copy()
    129133            #Multiply nonzero elements
     
    132136
    133137                new.A[key] = other*new.A[key]
    134         else:
    135             raise 'only right multiple with scalar implemented'
    136 
    137 #        print 'new.shape',new.shape
    138138
    139139        return new
  • inundation/ga/storm_surge/pyvolution/test_least_squares.py

    r454 r465  
    33import unittest
    44from math import sqrt
    5 from scipy import mat
     5#from scipy import mat
    66
    77from least_squares import *
Note: See TracChangeset for help on using the changeset viewer.