Changes in sasmodels/compare_many.py [cd3dba0:e922c5d] in sasmodels

File:

• sasmodels/compare_many.py (modified) (3 diffs)

sasmodels/compare_many.py

@@ -9 +9 @@
 from .compare import (MODELS, randomize_model, suppress_pd, eval_sasview,
                       eval_opencl, eval_ctypes, make_data, get_demo_pars,
-                      columnize, constrain_pars)
+                      columnize)
 
 def get_stats(target, value, index):
@@ -36 +36 @@
 def compare_instance(name, data, index, N=1, mono=True, cutoff=1e-5):
     model_definition = core.load_model_definition(name)
-    pars = get_demo_pars(model_definition)
+    pars = get_demo_pars(name)
     header = '\n"Model","%s","Count","%d"'%(name, N)
     if not mono: header += ',"Cutoff",%g'%(cutoff,)
     print(header)
 
+    # Stuff the failure flag into a mutable object so we can update it from
+    # within the nested function.  Note that the nested function uses "pars"
+    # which is dynamically scoped, not lexically scoped in this context.  That
+    # is, pars is replaced each time in the loop, so don't assume that it is
+    # the default values defined above.
     def trymodel(fn, *args, **kw):
         try:
-            result, _ = fn(model_definition, pars_i, data, *args, **kw)
-        except KeyboardInterrupt:
-            raise
+            result, _ = fn(model_definition, pars, data, *args, **kw)
         except:
-            print >>sys.stderr, traceback.format_exc()
-            print >>sys.stderr, "when comparing",name,"for seed",seed
-            if hasattr(data, 'qx_data'):
-                result = np.NaN*data.data
-            else:
-                result = np.NaN*data.x
+            result = np.NaN
+            traceback.print_exc()
         return result
 
     num_good = 0
     first = True
-    for k in range(N):
-        print >>sys.stderr, name, k
-        pars_i, seed = randomize_model(pars)
-        constrain_pars(model_definition, pars_i)
-        if mono: suppress_pd(pars_i)
+    for _ in range(N):
+        pars, seed = randomize_model(name, pars)
+        if mono: suppress_pd(pars)
+
+        # Force parameter constraints on a per-model basis.
+        if name in ('teubner_strey','broad_peak'):
+            pars['scale'] = 1.0
+        #if name == 'parallelepiped':
+        #    pars['a_side'],pars['b_side'],pars['c_side'] = \
+        #        sorted([pars['a_side'],pars['b_side'],pars['c_side']])
+
 
         good = True
@@ -92 +97 @@
             good = good and (stats[0] < 1e-14)
 
-        columns += [v for _,v in sorted(pars_i.items())]
+        columns += [v for _,v in sorted(pars.items())]
         if first:
-            print_column_headers(pars_i, labels)
+            print_column_headers(pars, labels)
             first = False
         if good: