Changeset 765eb0e in sasmodels

Timestamp:

Sep 11, 2017 5:42:31 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2ad5d30

Parents:

ce8c388

Message:

allow random generation of parameters for product and mixture models

Location:

sasmodels

Files:

• compare.py (modified) (4 diffs)
• mixture.py (modified) (5 diffs)
• product.py (modified) (4 diffs)

sasmodels/compare.py

@@ -88 +88 @@
     -magnetic/-nonmagnetic* suppress magnetism
     -accuracy=Low accuracy of the resolution calculation Low, Mid, High, Xhigh
+    -neval=1 sets the number of evals for more accurate timing
 
     === precision options ===
@@ -1013 +1014 @@
     'magnetic', 'nonmagnetic',
     'accuracy=',
+    'neval=',  # for timing...
 
     # Precision options
@@ -1018 +1020 @@
     'half', 'fast', 'single', 'double', 'single!', 'double!', 'quad!',
     'sasview',  # TODO: remove sasview 3.x support
-    'timing=',
 
     # Output options
@@ -1068 +1069 @@
 
     # Plug in values given in demo
-    if use_demo:
+    if use_demo and model_info.demo:
         pars.update(model_info.demo)
     return pars

sasmodels/mixture.py

@@ -40 +40 @@
     # Build new parameter list
     combined_pars = []
-    demo = {}
     for k, part in enumerate(parts):
         # Parameter prefix per model, A_, B_, ...
@@ -56 +55 @@
                 p.length_control = prefix + p.length_control
             combined_pars.append(p)
-        demo.update((prefix+k, v) for k, v in part.demo.items()
-                    if k != "background")
-    #print("pars",combined_pars)
     parameters = ParameterTable(combined_pars)
     parameters.max_pd = sum(part.parameters.max_pd for part in parts)
+
+    def random():
+        combined_pars = {}
+        for k, part in enumerate(parts):
+            prefix = chr(ord('A')+k) + '_'
+            pars = part.random()
+            combined_pars.update((prefix+k, v) for k, v in pars.items())
+        return combined_pars
 
     model_info = ModelInfo()
@@ -71 +75 @@
     model_info.category = "custom"
     model_info.parameters = parameters
+    model_info.random = random
     #model_info.single = any(part['single'] for part in parts)
     model_info.structure_factor = False
@@ -79 +84 @@
     # Remember the component info blocks so we can build the model
     model_info.composition = ('mixture', parts)
-    model_info.demo = demo
     return model_info
 
@@ -88 +92 @@
         self.info = model_info
         self.parts = parts
+        self.dtype = parts[0].dtype
 
     def make_kernel(self, q_vectors):

sasmodels/product.py

@@ -68 +68 @@
     translate_name = dict((old.id, new.id) for old, new
                           in zip(s_pars.kernel_parameters[1:], s_list))
-    demo = {}
-    demo.update(p_info.demo.items())
-    demo.update((translate_name[k], v) for k, v in s_info.demo.items()
-                if k not in ("background", "scale") and not k.startswith(ER_ID))
     combined_pars = p_pars.kernel_parameters + s_list
     parameters = ParameterTable(combined_pars)
     parameters.max_pd = p_pars.max_pd + s_pars.max_pd
+    def random():
+        combined_pars = p_info.random()
+        s_names = set(par.id for par in s_pars.kernel_parameters[1:])
+        s = s_info.random()
+        combined_pars.update((translate_name[k], v)
+                    for k, v in s_info.random().items()
+                    if k in s_names)
+        return combined_pars
 
     model_info = ModelInfo()
@@ -85 +89 @@
     model_info.category = "custom"
     model_info.parameters = parameters
+    model_info.random = random
     #model_info.single = p_info.single and s_info.single
     model_info.structure_factor = False
@@ -95 +100 @@
     # TODO: delegate random to p_info, s_info
     #model_info.random = lambda: {}
-    model_info.demo = demo
-
-    ## Show the parameter table with the demo values
+
+    ## Show the parameter table
     #from .compare import get_pars, parlist
     #print("==== %s ====="%model_info.name)
-    #values = get_pars(model_info, use_demo=True)
+    #values = get_pars(model_info)
     #print(parlist(model_info, values, is2d=True))
     return model_info
@@ -126 +130 @@
         self.P = P
         self.S = S
+        self.dtype = P.dtype
 
     def make_kernel(self, q_vectors):