Changeset 85f17f6 in sasview for src/sans/fit/BumpsFitting.py

Timestamp:

Apr 11, 2014 5:26:08 PM (11 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:

499639c

Parents:

042f065

Message:

put progress monitor on bumps

File:

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

src/sans/fit/BumpsFitting.py

@@ -11 +11 @@
 from sans.fit.AbstractFitEngine import FitEngine
 from sans.fit.AbstractFitEngine import FResult
+
+class BumpsMonitor(object):
+    def __init__(self, handler, max_step=0):
+        self.handler = handler
+        self.max_step = max_step
+    def config_history(self, history):
+        history.requires(time=1, value=2, point=1, step=1)
+    def __call__(self, history):
+        self.handler.progress(history.step[0], self.max_step)
+        if len(history.step)>1 and history.step[1] > history.step[0]:
+            self.handler.improvement()
+        self.handler.update_fit()
 
 class SasProblem(object):
@@ -240 +252 @@
 
         if True: # bumps
-            def abort_test():
-                try: curr_thread.isquit()
-                except KeyboardInterrupt:
-                    if handler is not None:
-                        handler.stop("Fitting: Terminated!!!")
-                    return True
-                return False
-
             problem = SasProblem(param_list=self.param_list,
                                  model=model.model,
                                  data=data)
-            run_bumps(problem, result, ftol, abort_test)
+            run_bumps(problem, result, ftol,
+                      handler, curr_thread, msg_q)
         else:
             problem = SasProblem(param_list=self.param_list,
@@ -263 +268 @@
 
         if handler is not None:
-            handler.set_result(result=result)
             handler.update_fit(last=True)
         if q is not None:
@@ -272 +276 @@
         return [result]
 
-def run_bumps(problem, result, ftol, abort_test):
+def run_bumps(problem, result, ftol, handler, curr_thread, msg_q):
+    def abort_test():
+        if curr_thread is None: return False
+        try: curr_thread.isquit()
+        except KeyboardInterrupt:
+            if handler is not None:
+                handler.stop("Fitting: Terminated!!!")
+            return True
+        return False
+
     fitopts = fitters.FIT_OPTIONS[fitters.FIT_DEFAULT]
     fitclass = fitopts.fitclass
     options = fitopts.options.copy()
+    max_steps = fitopts.options.get('steps', 0) + fitopts.options.get('burn', 0)
+    if 'monitors' not in options:
+        options['monitors'] = [BumpsMonitor(handler, max_steps)]
     options['ftol'] = ftol
     fitdriver = fitters.FitDriver(fitclass, problem=problem,
@@ -297 +313 @@
     result.theory = problem.theory
 
-def run_levenburg_marquardt(model, result, ftol):
+def run_levenburg_marquardt(problem, result, ftol):
     # This import must be here; otherwise it will be confused when more
     # than one thread exist.
     from scipy import optimize
 
-    out, cov_x, _, mesg, success = optimize.leastsq(model.residuals,
-                                                    model.getp(),
+    out, cov_x, _, mesg, success = optimize.leastsq(problem.residuals,
+                                                    problem.getp(),
                                                     ftol=ftol,
                                                     full_output=1)
@@ -310 +326 @@
     else:
         stderr = []
-    result.fitness = model.chisq()
+    result.fitness = problem.chisq()
     result.stderr  = stderr
     result.pvec = out
     result.success = success
-    result.theory = model.theory
-
+    result.theory = problem.theory
+