Changeset 1e2a1ba in sasmodels for sasmodels/core.py

Timestamp:

Apr 5, 2016 10:06:36 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:

d2bb604

Parents:

ea05c87 (diff), 4d76711 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/core.py
sasmodels/custom/init.py
sasmodels/direct_model.py
sasmodels/generate.py
sasmodels/kernelpy.py
sasmodels/sasview_model.py

File:

• sasmodels/core.py (modified) (2 diffs)

sasmodels/core.py

@@ -38 +38 @@
             return [np.asarray(v) for v in args]
 
+# TODO: refactor composite model support
+# The current load_model_info/build_model does not reuse existing model
+# definitions when loading a composite model, instead reloading and
+# rebuilding the kernel for each component model in the expression.  This
+# is fine in a scripting environment where the model is built when the script
+# starts and is thrown away when the script ends, but may not be the best
+# solution in a long-lived application.  This affects the following functions:
+#
+#    load_model
+#    load_model_info
+#    build_model
+
 def list_models():
     """
@@ -60 +72 @@
     """
     return build_model(load_model_info(model_name), **kw)
+
 
 def load_model_info(model_name):