Changeset 4bd557d in sasview

Timestamp:

Apr 24, 2009 4:34:48 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

ad6dd4c

Parents:

813334e

Message:

working on stop fitting only for scipy

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (5 diffs)
• Fitting.py (modified) (1 diff)
• ParkFitting.py (modified) (1 diff)
• ScipyFitting.py (modified) (4 diffs)

park_integration/AbstractFitEngine.py

@@ -211 +211 @@
         
         ## Min Q-value
-        #Skip the Q=0 point.
-        if min (self.data.x) ==0.0:
+        #Skip the Q=0 point, especially when y(q=0)=None at x[0].
+        if min (self.data.x) ==0.0 and self.data.x[0]==0 and not numpy.isfinite(self.data.y[0]):
             self.qmin = min(self.data.x[self.data.x!=0])
         else:                              
@@ -352 +352 @@
         return []
     
+class FitAbort(Exception):
+    """
+        Exception raise to stop the fit
+    """
+    print"Creating fit abort Exception"
+
+
 class sansAssembly:
     """
          Sans Assembly class a class wrapper to be call in optimizer.leastsq method
     """
-    def __init__(self,paramlist,Model=None , Data=None):
+    def __init__(self,paramlist,Model=None , Data=None, curr_thread= None):
         """
             @param Model: the model wrapper fro sans -model
@@ -364 +371 @@
         self.data  = Data
         self.paramlist=paramlist
+        self.curr_thread= curr_thread
         self.res=[]
+        self.func_name="Functor"
     def chisq(self, params):
         """
@@ -374 +383 @@
         for item in self.res:
             sum += item*item
-       
+        if len(self.res)==0:
+            return None
         return sum/ len(self.res)
     
@@ -385 +395 @@
         self.model.setParams(self.paramlist,params)
         self.res= self.data.residuals(self.model.eval)
-        #print "residuals",thread.get_ident()
+        if self.curr_thread != None :
+            try:
+                 self.curr_thread.isquit()
+            except:
+                raise FitAbort,"stop leastsqr optimizer"
+                
         return self.res
     

park_integration/Fitting.py

@@ -51 +51 @@
    
     
-    def fit(self,handler=None):
+    def fit(self,handler=None, curr_thread=None):
         """Perform the fit """
     
-        return self._engine.fit(handler)
+        return self._engine.fit(handler, curr_thread= curr_thread)
     
     

park_integration/ParkFitting.py

@@ -88 +88 @@
         
     
-    def fit(self,handler=None):
+    def fit(self,handler=None, curr_thread= None):
         """
             Performs fit with park.fit module.It can  perform fit with one model

park_integration/ScipyFitting.py

@@ -10 +10 @@
 from scipy import optimize
 
-from AbstractFitEngine import FitEngine, sansAssembly
+from AbstractFitEngine import FitEngine, sansAssembly,FitAbort
+print "in ScipyFitting fitabort",id(FitAbort),FitAbort.__class__.__module__
 
 class fitresult:
@@ -27 +28 @@
     parameters= None
     
+class old_FitAbort(Exception):
+    """
+        Exception raise to stop the fit
+    """
 class ScipyFit(FitEngine):
     """ 
@@ -62 +67 @@
     #    return profile(self._fit, *args, **kw)
 
-    def fit(self ,handler=None):
+    def fit(self ,handler=None,curr_thread= None):
        
         fitproblem=[]
@@ -81 +86 @@
         #data=self._concatenateData( listdata)
         data=listdata
-        functor= sansAssembly(self.paramList,model,data)
+        self.curr_thread= curr_thread
         
-        out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)
-        chisqr = functor.chisq(out)
+        try:
+            functor= sansAssembly(self.paramList,model,data, curr_thread= self.curr_thread)
+            out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)
+            
+            chisqr = functor.chisq(out)
+            
+            if cov_x is not None and numpy.isfinite(cov_x).all():
+                stderr = numpy.sqrt(numpy.diag(cov_x))
+            else:
+                stderr=None
+            if not (numpy.isnan(out).any()) or ( cov_x !=None) :
+                    result = fitresult()
+                    result.fitness = chisqr
+                    result.stderr  = stderr
+                    result.pvec = out
+                    result.success =success
+                    return result
+            else:  
+                raise ValueError, "SVD did not converge"+str(success)
+        except FitAbort:
+            ## fit engine is stop
+            print "fitabort====>"
+            return None
         
-        if cov_x is not None and numpy.isfinite(cov_x).all():
-            stderr = numpy.sqrt(numpy.diag(cov_x))
-        else:
-            stderr=None
-        if not (numpy.isnan(out).any()) or ( cov_x !=None) :
-                result = fitresult()
-                result.fitness = chisqr
-                result.stderr  = stderr
-                result.pvec = out
-                result.success =success
-               
-                return result
-        else:  
-            raise ValueError, "SVD did not converge"+str(success)
-        
+        except:
+            return Fitresult()
        
 def profile(fn, *args, **kw):