Changeset 763

Timestamp:

10/07/14 15:29:24 (20 months ago)

Author:

mmckerns

Message:

use numpy.seterr to ignore nan in measures.normalize and in greater/less bounds

Location:

mystic

Files:

• _math/measures.py (modified) (1 diff)
• mystic/abstract_map_solver.py (modified) (1 diff)
• mystic/abstract_solver.py (modified) (2 diffs)
• mystic/scipy_optimize.py (modified) (1 diff)

mystic/_math/measures.py

@@ -380 +380 @@
   w = float(sum(weights))
   if not w:  #XXX: is this the best behavior?
-    from numpy import inf
+    from numpy import inf, nan
+    weights[weights == 0.0] = nan
     return list(weights * inf)  # protect against ZeroDivision
   if float(mass) or not zsum:

mystic/mystic/abstract_map_solver.py

@@ -41 +41 @@
     >>> from pyina.launchers import Mpi as Pool
     >>> NNODES = 4
-    >>>> npts = 20
+    >>> npts = 20
     >>>
     >>> # instantiate and configure the solver
-    >>> from mystic.solvers import ScattershotSolver
-    >>> solver = ScattershotSolver(len(lb), npts)
+    >>> from mystic.solvers import BuckshotSolver
+    >>> solver = BuckshotSolver(len(lb), npts)
     >>> solver.SetMapper(Pool(NNODES).map)
     >>> solver.SetGenerationMonitor(stepmon)

mystic/mystic/abstract_solver.py

@@ -77 +77 @@
 
 import numpy
-from numpy import inf, shape, asarray, absolute, asfarray
+from numpy import inf, shape, asarray, absolute, asfarray, seterr
 from mystic.tools import wrap_function, wrap_nested, wrap_reducer
 from mystic.tools import wrap_bounds, wrap_penalty, reduced
@@ -341 +341 @@
         hi = self._strictMax
         # crop x0 at bounds
+        settings = numpy.seterr(all='ignore')
         x0[x0<lo] = lo[x0<lo]
         x0[x0>hi] = hi[x0>hi]
+        numpy.seterr(**settings)
         return x0
 

mystic/mystic/scipy_optimize.py

@@ -119 +119 @@
         val[bounded] = x0[bounded] + (hi[bounded]-lo[bounded])*radius
         # crop val at bounds
+        settings = numpy.seterr(all='ignore')
         val[val<lo] = lo[val<lo]
         val[val>hi] = hi[val>hi]
+        numpy.seterr(**settings)
         # handle collisions (when val[i] == x0[i])
         collision = val==x0