Changeset e0072082 in sasview

Timestamp:

Apr 13, 2010 5:47:26 PM (14 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:

e54d2c32

Parents:

6345640

Message:

displaying result on status bar for single fit

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (2 diffs)
• ScipyFitting.py (modified) (5 diffs)

park_integration/AbstractFitEngine.py

@@ -341 +341 @@
          Sans Assembly class a class wrapper to be call in optimizer.leastsq method
     """
-    def __init__(self,paramlist,Model=None , Data=None, curr_thread= None):
+    def __init__(self, paramlist, model=None , data=None, fitresult=None,
+                 handler=None, curr_thread=None):
         """
             @param Model: the model wrapper fro sans -model
             @param Data: the data wrapper for sans data
         """
-        self.model = Model
-        self.data  = Data
-        self.paramlist=paramlist
-        self.curr_thread= curr_thread
-        self.res=[]
-        self.func_name="Functor"
+        self.model = model
+        self.data  = data
+        self.paramlist = paramlist
+        self.curr_thread = curr_thread
+        self.handler = handler
+        self.fitresult = fitresult
+        self.res = []
+        self.func_name = "Functor"
+        
     def chisq(self, params):
         """
@@ -373 +377 @@
         self.model.setParams(self.paramlist,params)
         self.res= self.data.residuals(self.model.eval)
+        if self.fitresult is not None and  self.handler is not None:
+            self.fitresult.set_model(model=self.model)
+            self.handler.set_result(result=self.fitresult)
+            self.handler.update_fit()
+        
         #if self.curr_thread != None :
         #    try:

park_integration/ScipyFitting.py

@@ -10 +10 @@
 from AbstractFitEngine import FitEngine, SansAssembly,FitAbort
 
-class fitresult:
+class fitresult(object):
     """
         Storing fit result
     """
-    calls     = None
-    fitness   = None
-    chisqr    = None
-    pvec      = None
-    cov       = None
-    info      = None
-    mesg      = None
-    success   = None
-    stderr    = None
-    parameters= None
+    def __init__(self, model=None, paramList=None):
+        self.calls     = None
+        self.fitness   = None
+        self.chisqr    = None
+        self.pvec      = None
+        self.cov       = None
+        self.info      = None
+        self.mesg      = None
+        self.success   = None
+        self.stderr    = None
+        self.parameters = None
+        self.model = model
+        self.paramList = paramList
+     
+    def set_model(self, model):
+        self.model = model
+        
+    def __str__(self):
+        if self.pvec == None and self.model is None and self.paramList is None:
+            return "No results"
+        n = len(self.model.parameterset)
+
+        result_param = zip(xrange(n), self.model.parameterset)
+        L = ["P%-3d  %s......|.....%s"%(p[0], p[1], p[1].value) for p in result_param if p[1].name in self.paramList ]
+        L.append("=== goodness of fit: %s"%(str(self.fitness)))
+        return "\n".join(L)
     
+    def print_summary(self):
+        print self   
 
 class ScipyFit(FitEngine):
@@ -61 +79 @@
     #    return profile(self._fit, *args, **kw)
 
-    def fit(self ,q=None,handler=None,curr_thread= None):
+    def fit(self, q=None, handler=None, curr_thread=None):
        
         fitproblem=[]
@@ -68 +86 @@
                 fitproblem.append(fproblem)
         if len(fitproblem)>1 : 
-            raise RuntimeError, "Scipy can't fit more than a single fit problem at a time."
+            msg = "Scipy can't fit more than a single fit problem at a time."
+            raise RuntimeError, msg
             return
         elif len(fitproblem)==0 : 
@@ -78 +97 @@
         listdata = fitproblem[0].get_data()
         # Concatenate dList set (contains one or more data)before fitting
-        #data=self._concatenateData( listdata)
-        data=listdata
+        data = listdata
         self.curr_thread= curr_thread
-
+        result = fitresult(model=model, paramList=self.paramList)
+        if handler is not None:
+            handler.set_result(result=result)
         #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)
+        functor = SansAssembly(self.paramList, model, data, handler=handler,
+                                fitresult=result,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)
@@ -91 +116 @@
             stderr = numpy.sqrt(numpy.diag(cov_x))
         else:
-            stderr=None
+            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
-                if q !=None:
-                    print "went here"
+                print result
+                if q is not  None:
+                    #print "went here"
                     q.put(result)
-                    print "get q scipy fit enfine",q.get()
+                    #print "get q scipy fit enfine",q.get()
                     return q
                 return result
         else:  
             raise ValueError, "SVD did not converge"+str(success)
-        #except FitAbort:
-            ## fit engine is stop
-        #    return None
-        
-        #except:
-        #    raise
-       
+