Changeset 89f3b66 in sasview for park_integration/ScipyFitting.py

Timestamp:

Oct 19, 2010 9:02:08 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:

4ddb7a4

Parents:

74b1770

Message:

working pylint

File:

• park_integration/ScipyFitting.py (modified) (7 diffs)

park_integration/ScipyFitting.py

@@ -10 +10 @@
 from scipy import optimize
 
-from AbstractFitEngine import FitEngine, SansAssembly,FitAbort
+from AbstractFitEngine import FitEngine, SansAssembly, FitAbort
 
 class fitresult(object):
@@ -17 +17 @@
     """
     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.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
@@ -48 +48 @@
 
         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)))
+        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)
     
@@ -89 +90 @@
         with Uid as keys
         """
-        self.fitArrangeDict={}
-        self.paramList=[]
+        self.fitArrangeDict = {}
+        self.paramList = []
     #def fit(self, *args, **kw):
     #    return profile(self._fit, *args, **kw)
@@ -97 +98 @@
         """
         """
-        fitproblem=[]
-        for id ,fproblem in self.fitArrangeDict.iteritems():
-            if fproblem.get_to_fit()==1:
+        fitproblem = []
+        for id, fproblem in self.fitArrangeDict.iteritems():
+            if fproblem.get_to_fit() == 1:
                 fitproblem.append(fproblem)
-        if len(fitproblem)>1 : 
+        if len(fitproblem) > 1 : 
             msg = "Scipy can't fit more than a single fit problem at a time."
             raise RuntimeError, msg
             return
-        elif len(fitproblem)==0 : 
+        elif len(fitproblem) == 0 : 
             raise RuntimeError, "No Assembly scheduled for Scipy fitting."
             return
     
-        listdata=[]
+        listdata = []
         model = fitproblem[0].get_model()
         listdata = fitproblem[0].get_data()
         # Concatenate dList set (contains one or more data)before fitting
         data = listdata
-        self.curr_thread= curr_thread
+        self.curr_thread = curr_thread
         result = fitresult(model=model, paramList=self.paramList)
         if handler is not None:
@@ -120 +121 @@
         #try:
         functor = SansAssembly(self.paramList, model, data, handler=handler,
-                                fitresult=result,curr_thread= self.curr_thread)
+                         fitresult=result, curr_thread= self.curr_thread)
        
        
@@ -146 +147 @@
                 return result
         else:  
-            raise ValueError, "SVD did not converge"+str(success)
+            raise ValueError, "SVD did not converge" + str(success)