Changeset 7a516d0 in sasmodels

Timestamp:

Jan 25, 2018 10:13:41 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Branches:

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

Children:

c11d09f

Parents:

7fec3b7

Message:

Add test for model combiner

File:

• sasmodels/core.py (modified) (1 diff)

sasmodels/core.py

@@ -320 +320 @@
     print("\n".join(list_models(kind)))
 
+def test_load():
+    # type: () -> None
+    """Check that model load works"""
+    def test_models(fst, snd):
+        """Confirm that two models produce the same parameters"""
+        fst = load_model(fst)
+        snd = load_model(snd)
+        # Remove the upper case characters frin the parameters, since
+        # they lasndel the order of events and we specfically are
+        # changin that aspect
+        fst = [[x for x in p.name if x == x.lower()] for p in fst.info.parameters.kernel_parameters]
+        snd = [[x for x in p.name if x == x.lower()] for p in snd.info.parameters.kernel_parameters]
+        assert sorted(fst) == sorted(snd), "{} != {}".format(fst, snd)
+
+
+    test_models(
+        "cylinder+sphere",
+        "sphere+cylinder")
+    test_models(
+        "cylinder*sphere",
+        "sphere*cylinder")
+    test_models(
+        "cylinder@hardsphere*sphere",
+        "sphere*cylinder@hardsphere")
+    test_models(
+        "barbell+sphere*cylinder@hardsphere",
+        "sphere*cylinder@hardsphere+barbell")
+    test_models(
+        "barbell+cylinder@hardsphere*sphere",
+        "cylinder@hardsphere*sphere+barbell")
+    test_models(
+        "barbell+sphere*cylinder@hardsphere",
+        "barbell+cylinder@hardsphere*sphere")
+    test_models(
+        "sphere*cylinder@hardsphere+barbell",
+        "cylinder@hardsphere*sphere+barbell")
+    test_models(
+        "barbell+sphere*cylinder@hardsphere",
+        "cylinder@hardsphere*sphere+barbell")
+    test_models(
+        "barbell+cylinder@hardsphere*sphere",
+        "sphere*cylinder@hardsphere+barbell")
+
+    #Test the the model produces the parameters that we would expect
+    model = load_model("cylinder@hardsphere*sphere")
+    actual = [p.name for p in model.info.parameters.kernel_parameters]
+    target = ("sld sld_solvent radius length theta phi volfraction"
+              " A_sld A_sld_solvent A_radius").split()
+    assert target == actual, "%s != %s"%(target, actual)
+
 if __name__ == "__main__":
     list_models_main()