Changeset bb4b509 in sasmodels for sasmodels/model_test.py

Timestamp:

May 16, 2017 12:14:04 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:

452b168

Parents:

ba62072

Message:

check parameter names as part of test; PEP8 cleanup

File:

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

sasmodels/model_test.py

@@ -85 +85 @@
         skip = []
     for model_name in models:
-        if model_name in skip: continue
+        if model_name in skip:
+            continue
         model_info = load_model_info(model_name)
 
@@ -239 +240 @@
             multiple = [test for test in self.info.tests
                         if isinstance(test[2], list)
-                            and not all(result is None for result in test[2])]
+                        and not all(result is None for result in test[2])]
             tests_has_1D_multiple = any(isinstance(test[1][0], float)
                                         for test in multiple)
@@ -262 +263 @@
             user_pars, x, y = test
             pars = expand_pars(self.info.parameters, user_pars)
+            invalid = invalid_pars(self.info.parameters, pars)
+            if invalid:
+                raise ValueError("Unknown parameters in test: " + ", ".join(invalid))
 
             if not isinstance(y, list):
@@ -305 +309 @@
 
     return ModelTestCase
+
+def invalid_pars(partable, pars):
+    # type: (ParameterTable, Dict[str, float])
+    """
+    Return a list of parameter names that are not part of the model.
+    """
+    names = set(p.id for p in partable.call_parameters)
+    invalid = []
+    for par in sorted(pars.keys()):
+        parts = par.split('_pd')
+        if len(parts) > 1 and parts[1] not in ("", "_n", "nsigma", "type"):
+            invalid.append(par)
+            continue
+        if parts[0] not in names:
+            invalid.append(par)
+    return invalid
+
 
 def is_near(target, actual, digits=5):