Changeset 35adaf6 in sasview

Timestamp:

Jun 30, 2008 2:56:01 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

bd30f4a5

Parents:

e96a852

Message:

From Raiza: n_term estimator. GUI.

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (7 diffs)
• pr.py (modified) (3 diffs)
• pr_thread.py (modified) (3 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -149 +149 @@
         ## Estimates
         self.alpha_estimate_ctl = None
+        self.nterms_estimate_ctl = None
         
         ## Data manager
@@ -194 +195 @@
             #self.alpha_estimate_ctl.Show()
             #self.label_sugg.Show()
+        elif name=='nterms_estimate':
+            self.nterms_estimate_ctl.SetToolTipString("Click to accept value.")
+            self.nterms_estimate_ctl.Enable(True)
+            self.nterms_estimate_ctl.SetLabel("%-g" % value)
         elif name=='plotname':
             if self.standalone==False:
@@ -274 +279 @@
         elif name=='alpha_estimate':
             return self.alpha_estimate_ctl.GetLabel()
+        elif name=='nterms_estimate':
+            return self.nterms_estimate_ctl.GetLabel()
         elif name=='plotname':
             if self.standalone==False:
@@ -400 +407 @@
         self.alpha_estimate_ctl.SetToolTipString("Waiting for estimate...")
         
+        id = wx.NewId()
+        self.nterms_estimate_ctl  = wx.Button(self, id, "")
+        #self.nterms_estimate_ctl.Hide()
+        self.Bind(wx.EVT_BUTTON, self._on_accept_nterms, id = id)   
+        self.nterms_estimate_ctl.Enable(False)
+        #self.nterms_estimate_ctl.SetBackgroundColour('#ffdf85')
+        #self.nterms_estimate_ctl.SetBackgroundColour(self.GetBackgroundColour())
+        self.nterms_estimate_ctl.SetToolTipString("Waiting for estimate...")
+        
         # EVT_TEXT would trigger an event for each character entered
         #self.nfunc_ctl.Bind(wx.EVT_KILL_FOCUS, self._on_pars_changed)
@@ -420 +436 @@
         sizer_params.Add(label_nfunc,      (iy,0), (1,1), wx.LEFT, 15)
         sizer_params.Add(self.nfunc_ctl,   (iy,1), (1,1), wx.RIGHT, 0)
+        sizer_params.Add(self.nterms_estimate_ctl, (iy,2), (1,1), wx.LEFT, 15)
         iy += 1
         sizer_params.Add(label_alpha,      (iy,0), (1,1), wx.LEFT, 15)
@@ -593 +610 @@
             print "InversionControl._on_accept_alpha: %s" % sys.exc_value
             pass
+    
+    def _on_accept_nterms(self, evt):
+        """
+            User has accepted the estimated number of terms, 
+            set it as part of the input parameters
+        """
+        try:
+            nterms = self.nterms_estimate_ctl.GetLabel()
+            tmp = float(nterms)
+            self.nfunc_ctl.SetValue(nterms)
+        except:
+            # No estimate or bad estimate, either do nothing
+            import sys
+            print "InversionControl._on_accept_nterms: %s" % sys.exc_value
+            pass
         
     def _on_reset(self, evt):
@@ -613 +645 @@
         self.alpha_estimate_ctl.Enable(False)
         self.alpha_estimate_ctl.SetLabel("")
+        self.nterms_estimate_ctl.Enable(False)
+        self.nterms_estimate_ctl.SetLabel("")
         self._on_pars_changed()
         

prview/perspectives/pr/pr.py

@@ -403 +403 @@
         if not message==None:
             wx.PostEvent(self.parent, StatusEvent(status=str(message)))
+            
+        self.perform_estimateNT()
+    
+
+    
+    def _estimateNT_completed(self, nterms, alpha, message, elapsed):
+        """
+            Parameter estimation completed, 
+            display the results to the user
+            @param alpha: estimated best alpha
+            @param nterms: estimated number of terms
+            @param elapsed: computation time
+        """
+        # Save useful info
+        print "Number of terms =", nterms
+        self.elapsed = elapsed
+        self.control_panel.nterms_estimate = nterms
+        self.control_panel.alpha_estimate = alpha
+        if not message==None:
+            wx.PostEvent(self.parent, StatusEvent(status=str(message)))
     
     def _completed(self, out, cov, pr, elapsed):
@@ -613 +633 @@
         self.estimation_thread = EstimatePr(pr, self.nfunc, error_func=self._thread_error, 
                                             completefn = self._estimate_completed, 
+                                            updatefn   = None)
+        self.estimation_thread.queue()
+        self.estimation_thread.ready(2.5)
+    
+    def perform_estimateNT(self):
+        from pr_thread import EstimateNT
+        from copy import deepcopy
+        
+        wx.PostEvent(self.parent, StatusEvent(status=''))
+        # If a thread is already started, stop it
+        if self.estimation_thread != None and self.estimation_thread.isrunning():
+            self.estimation_thread.stop()
+                
+        pr = self.pr.clone()
+        self.estimation_thread = EstimateNT(pr, self.nfunc, error_func=self._thread_error, 
+                                            completefn = self._estimateNT_completed, 
                                             updatefn   = None)
         self.estimation_thread.queue()
@@ -746 +782 @@
         """
         self.parent.set_perspective(self.perspective)
-    
+  
+if __name__ == "__main__":
+    i = Plugin()
+    print i.perform_estimateNT()
+    
+    
+    
+    

prview/perspectives/pr/pr_thread.py

@@ -75 +75 @@
             CalcThread.isquit(self)
         except KeyboardInterrupt:
-            printEVT("P(r) calc interrupted")
+            printEVT("Alpha estimator thread interrupted")
             raise KeyboardInterrupt    
         
@@ -84 +84 @@
         try:            
             alpha, message, elapsed = self.pr.estimate_alpha(self.nfunc)
+            self.isquit()
             self.complete(alpha=alpha, message=message, elapsed=elapsed)
         except:
@@ -89 +90 @@
                 printEVT("EstimatePr.compute: %s" % sys.exc_value)
 
+class EstimateNT(CalcThread):
     
+    def __init__(self, pr, nfunc=5, error_func=None,
+                 completefn = None,
+                 updatefn   = None,
+                 yieldtime  = 0.01,
+                 worktime   = 0.01
+                 ):
+        CalcThread.__init__(self,completefn,
+                 updatefn,
+                 yieldtime,
+                 worktime)
+        self.pr = pr
+        self.nfunc = nfunc
+        self.error_func = error_func
+        self.starttime = 0
+        
+    def isquit(self):
+        try:
+            CalcThread.isquit(self)
+        except KeyboardInterrupt:
+            printEVT("Number of terms thread interrupted")
+            raise KeyboardInterrupt    
+        
+    def compute(self):
+        """
+            Calculates the estimate
+        """
+        import time
+        try:            
+            t_0 = time.time()
+            nterms, alpha, message = self.pr.estimate_numterms(self.isquit)
+            t_1 = time.time()-t_0
+            self.isquit()
+            self.complete(nterms=nterms, alpha=alpha, message=message, elapsed=t_1)
+        except:
+            if not self.error_func==None:
+                printEVT("EstimatePr2.compute: %s" % sys.exc_value)
+
+