Changeset 35086c3 in sasview for src/sans

Timestamp:

Jun 3, 2014 6:12:35 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:

949aa2c

Parents:

ddfe1eb7

Message:

show fit progress for bumps

Location:

src/sans

Files:

• fit/BumpsFitting.py (modified) (4 diffs)
• perspectives/fitting/console.py (modified) (4 diffs)

src/sans/fit/BumpsFitting.py

@@ -2 +2 @@
 BumpsFitting module runs the bumps optimizer.
 """
+from datetime import timedelta, datetime
+
 import numpy
 
@@ -13 +15 @@
 from .expression import compile_constraints
 
+class Progress(object):
+    def __init__(self, history, max_step, pars, dof):
+        remaining_time = int(history.time[0]*(float(max_step)/history.step[0]-1))
+        # Depending on the time remaining, either display the expected
+        # time of completion, or the amount of time remaining.  Use precision
+        # appropriate for the duration.
+        if remaining_time >= 1800:
+            completion_time = datetime.now() + timedelta(seconds=remaining_time)
+            if remaining_time >= 36000:
+                time = completion_time.strftime('%Y-%m-%d %H:%M')
+            else:
+                time = completion_time.strftime('%H:%M')
+        else:
+            if remaining_time >= 3600:
+                time = '%dh %dm'%(remaining_time//3600, (remaining_time%3600)//60)
+            elif remaining_time >= 60:
+                time = '%dm %ds'%(remaining_time//60, remaining_time%60)
+            else:
+                time = '%ds'%remaining_time
+        chisq = "%.3g"%(2*history.value[0]/dof)
+        step = "%d of %d"%(history.step[0], max_step)
+        header = "=== Steps: %s  chisq: %s  ETA: %s\n"%(step, chisq, time)
+        parameters = ["%15s: %-10.3g%s"%(k,v,("\n" if i%3==2 else " | "))
+                      for i,(k,v) in enumerate(zip(pars,history.point[0]))]
+        self.msg = "".join([header]+parameters)
+
+    def __str__(self):
+        return self.msg
+
+
 class BumpsMonitor(object):
-    def __init__(self, handler, max_step=0):
+    def __init__(self, handler, max_step, pars, dof):
         self.handler = handler
         self.max_step = max_step
+        self.pars = pars
+        self.dof = dof
 
     def config_history(self, history):
@@ -23 +57 @@
     def __call__(self, history):
         if self.handler is None: return
+        self.handler.set_result(Progress(history, self.max_step, self.pars, self.dof))
         self.handler.progress(history.step[0], self.max_step)
         if len(history.step)>1 and history.step[1] > history.step[0]:
@@ -252 +287 @@
     options = fitopts.options.copy()
     max_step = fitopts.options.get('steps', 0) + fitopts.options.get('burn', 0)
+    pars = [p.name for p in problem._parameters]
     options['monitors'] = [
-        BumpsMonitor(handler, max_step),
+        BumpsMonitor(handler, max_step, pars, problem.dof),
         ConvergenceMonitor(),
         ]

src/sans/perspectives/fitting/console.py

@@ -128 +128 @@
             
         
-    def update_fit(self, msg="", last=False):
+    def update_fit(self, last=False):
         """
         """
@@ -135 +135 @@
         self.update_duration = t1
         self.fit_duration += self.elapsed_time
-        str_time = time.strftime("%a, %d %b %Y %H:%M:%S ", time.localtime(t1))
+        str_time = time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(t1))
         UPDATE_INTERVAL = 5.0
         u_flag = False
@@ -141 +141 @@
             self.fit_duration = 0
             u_flag = True
-        if not last:
-            msg += "Fit Updates ... %s \n" % str_time    
-        else:
-            msg += "Final updates ........."
+        msg = str_time
         if u_flag or last:
             if self.result is not None:
@@ -163 +160 @@
                 msg +=  str(self.result)
                 msg += "\n"
-                if not last:
-                    msg += "About %s s elapsed......... \n" % \
-                                            str (UPDATE_INTERVAL)
             else:
                 msg += "No result available\n"