Changeset fc049b7 in sasview

Timestamp:

Apr 4, 2014 11:30:16 AM (11 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

767514a

Parents:

f309303

Message:

fix park bounds checking

File:

• park-1.2.1/park/simplex.py (modified) (1 diff)

park-1.2.1/park/simplex.py

@@ -157 +157 @@
 
         # Keep the initial simplex inside the bounds
-        x0[x0<lo] = lo
-        x0[x0>hi] = hi
+        x0[x0<lo] = lo[x0<lo]
+        x0[x0>hi] = hi[x0>hi]
         bounded = ~numpy.isinf(lo) & ~numpy.isinf(hi)
         val[bounded] = x0[bounded] + (hi[bounded]-lo[bounded])*radius
-        val[val<lo] = lo
-        val[val>hi] = hi
+        val[val<lo] = lo[val<lo]
+        val[val>hi] = hi[val>hi]
         
         # If the initial point was at or beyond an upper bound, then bounds