Changeset 084afb4 in sasview

Timestamp:

Apr 4, 2014 5:16:11 PM (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:

da5d8e8

Parents:

c5442fb

Message:

fix random initial conditions for infinite ranges in amoeba fit

File:

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

park-1.2.1/park/fitmc.py

@@ -147 +147 @@
     See `park.fitresult.FitHandler` for details.
     """
+    # Generate random number within bounds.  If bounds are indefinite, use [0,1]
+    # If bounds are semi-definite, use [low,low+1] or [high-1,high], depending
+    # on which limit is unbounded.
     lo,hi = bounds
+    inf_lo = numpy.isinf(lo)
+    inf_hi = numpy.isinf(hi)
     delta = hi-lo
-    delta[numpy.isinf(delta)] = 1
-    lo[numpy.isinf(lo)] = hi-1
-    lo[numpy.isinf(lo)] = 0
+    delta[inf_lo|inf_hi] = 1.0
+    lo[inf_lo] = hi[inf_lo] - 1.0
+    lo[inf_lo&inf_hi] = 0.0
     P = numpy.random.rand(n,len(x0))*delta+lo
     #print "Population",P
     P[0] = x0
+
     pmap.pmapreduce(MapMC(localfit,fitness),
                     CollectMC(n,handler),