Changeset 191c648 in sasview for src/sans

Timestamp:

Jun 13, 2014 7:19:28 PM (10 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1790664

Parents:

249a7c6

Message:

redo bumps constraints handling to allow pickling on windows

File:

• src/sans/fit/BumpsFitting.py (modified) (2 diffs)

src/sans/fit/BumpsFitting.py

@@ -191 +191 @@
     #     resynth_data/restore_data/save/plot
 
+class ParameterExpressions(object):
+    def __init__(self, models):
+        self.models = models
+        self._setup()
+
+    def _setup(self):
+        exprs = {}
+        for M in self.models:
+            exprs.update((".".join((M.name, k)), v) for k, v in M.constraints.items())
+        if exprs:
+            symtab = dict((".".join((M.name, k)), p)
+                          for M in self.models
+                          for k,p in M.parameters().items())
+            self.update = compile_constraints(symtab, exprs)
+        else:
+            self.update = lambda: 0
+
+    def __call__(self):
+        self.update()
+
+    def __getstate__(self):
+        return self.models
+
+    def __setstate__(self, state):
+        self.models = state
+        self._setup()
+
 class BumpsFit(FitEngine):
     """
@@ -218 +245 @@
         problem = FitProblem(models)
 
-
-        # Build constraint expressions
-        exprs = {}
-        for M in models:
-            exprs.update((".".join((M.name, k)), v) for k, v in M.constraints.items())
-        if exprs:
-            symtab = dict((".".join((M.name, k)), p)
-                          for M in models
-                          for k,p in M.parameters().items())
-            constraints = compile_constraints(symtab, exprs)
-        else:
-            constraints = lambda: 0
-
-        # Override model update so that parameter constraints are applied
-        problem._model_update = problem.model_update
-        def model_update():
-            constraints()
-            problem._model_update()
-        problem.model_update = model_update
+        # TODO: need better handling of parameter expressions and bounds constraints
+        # so that they are applied during polydispersity calculations.  This
+        # will remove the immediate need for the setp_hook in bumps, though
+        # bumps may still need something similar, such as a sane class structure
+        # which allows a subclass to override setp.
+        problem.setp_hook = ParameterExpressions(models)
 
         # Run the fit