Changeset 4bfd277 in sasmodels for sasmodels/model_test.py

Timestamp:

Apr 8, 2016 10:11:16 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2afc26d

Parents:

d2fc9a4

Message:

support ER/VR calls with vector parameters

File:

• sasmodels/model_test.py (modified) (8 diffs)

sasmodels/model_test.py

@@ -56 +56 @@
 from .direct_model import call_kernel, get_weights
 from .exception import annotate_exception
-
-
-def call_ER(model_info, values):
+from .modelinfo import expand_pars
+
+def call_ER(model_info, pars):
     """
     Call the model ER function using *values*. *model_info* is either
@@ -67 +67 @@
         return 1.0
     else:
-        vol_pars = [get_weights(parameter, values)
-                    for parameter in model_info.parameters.call_parameters
-                    if parameter.type == 'volume']
-        value, weight = dispersion_mesh(vol_pars)
+        value, weight = _vol_pars(model_info, pars)
         individual_radii = model_info.ER(*value)
         return np.sum(weight*individual_radii) / np.sum(weight)
 
-def call_VR(model_info, values):
+def call_VR(model_info, pars):
     """
     Call the model VR function using *pars*.
@@ -83 +80 @@
         return 1.0
     else:
-        vol_pars = [get_weights(parameter, values)
-                    for parameter in model_info.parameters.call_parameters
-                    if parameter.type == 'volume']
-        value, weight = dispersion_mesh(vol_pars)
+        value, weight = _vol_pars(model_info, pars)
         whole, part = model_info.VR(*value)
         return np.sum(weight*part)/np.sum(weight*whole)
+
+def _vol_pars(model_info, pars):
+    vol_pars = [get_weights(p, pars)
+                for p in model_info.parameters.call_parameters
+                if p.type == 'volume']
+    value, weight = dispersion_mesh(model_info, vol_pars)
+    return value, weight
 
 
@@ -175 +176 @@
             self.dtype = dtype
 
-            setattr(self, test_method_name, self._runTest)
+            setattr(self, test_method_name, self.run_all)
             unittest.TestCase.__init__(self, test_method_name)
 
-        def _runTest(self):
+        def run_all(self):
             smoke_tests = [
                 [{}, 0.1, None],
@@ -191 +192 @@
                                     platform=self.platform)
                 for test in smoke_tests + tests:
-                    self._run_one_test(model, test)
+                    self.run_one(model, test)
 
                 if not tests and self.platform == "dll":
@@ -205 +206 @@
                 raise
 
-        def _run_one_test(self, model, test):
+        def run_one(self, model, test):
             pars, x, y = test
+            pars = expand_pars(self.info.parameters, pars)
 
             if not isinstance(y, list):
@@ -229 +231 @@
                 actual = call_kernel(kernel, pars)
 
-            self.assertGreater(len(actual), 0)
+            self.assertTrue(len(actual) > 0)
             self.assertEqual(len(y), len(actual))
 
@@ -311 +313 @@
     tests = make_suite(['opencl', 'dll'], ['all'])
     for test_i in tests:
-        yield test_i._runTest
+        yield test_i.run_all