diff options
| author | cookedm <cookedm@localhost> | 2006-03-07 22:02:23 +0000 |
|---|---|---|
| committer | cookedm <cookedm@localhost> | 2006-03-07 22:02:23 +0000 |
| commit | c9d2cdc913171d079eabb6b71405d7101041356b (patch) | |
| tree | a66f5fe7b0d197b434e83fe3e17dbd87076f3839 /numpy/lib/getlimits.py | |
| parent | e3a1d502e5d08a755dd1d91eb74341c7617adbdd (diff) | |
| parent | 5bb7342c6c2fa9757edc28df0dbbc8d433ac50d8 (diff) | |
| download | numpy-c9d2cdc913171d079eabb6b71405d7101041356b.tar.gz | |
Merge trunk (r2142:2204) to power_optimization branch
Diffstat (limited to 'numpy/lib/getlimits.py')
| -rw-r--r-- | numpy/lib/getlimits.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/lib/getlimits.py b/numpy/lib/getlimits.py index 921baebe2..776e2550c 100644 --- a/numpy/lib/getlimits.py +++ b/numpy/lib/getlimits.py @@ -75,13 +75,15 @@ class finfo(object): else: raise ValueError,`dtype` - for word in ['tiny', 'precision', 'resolution','iexp', - 'maxexp','minexp','epsneg','negep', + for word in ['precision', 'iexp', + 'maxexp','minexp','negep', 'machep']: setattr(self,word,getattr(machar, word)) - self.max = machar.huge + for word in ['tiny','resolution','epsneg']: + setattr(self,word,getattr(machar, word).squeeze()) + self.max = machar.huge.squeeze() self.min = -self.max - self.eps = machar.epsilon + self.eps = machar.epsilon.squeeze() self.nexp = machar.iexp self.nmant = machar.it self.machar = machar |