Changeset 2f4b430 in sasview for src/sas/perspectives/fitting/console.py

Timestamp:

Mar 4, 2015 3:39:45 PM (10 years ago)

Author:

Doucet, Mathieu <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:

74f419d

Parents:

2f732b0

Message:

Take care of white spaces (pylint)

File:

• src/sas/perspectives/fitting/console.py (modified) (13 diffs)

src/sas/perspectives/fitting/console.py

@@ -2 +2 @@
 
 
-from sas.guiframe.events import StatusEvent 
+from sas.guiframe.events import StatusEvent
 import time
 import wx
@@ -13 +13 @@
     isbetter = False
     """Record whether results improved since last update"""
-    progress_delta =  60
+    progress_delta = 60
     """Number of seconds between progress updates"""
     improvement_delta = 5
     """Number of seconds between improvement updates"""
     def __init__(self, parent, manager=None,
-                 quiet=False,progress_delta=60,improvement_delta=5):
+                 quiet=False, progress_delta=60, improvement_delta=5):
         """
         If quiet is true, only print out final summary, not progress and
         improvements.
-        
+
         :attr parent: the object that handle the messages
-        
+
         """
-        self.parent= parent
+        self.parent = parent
         self.manager = manager
         self.progress_time = time.time()
@@ -38 +38 @@
         self.update_duration = time.time()
         self.fit_duration = 0
-        
-        
+
+
     def progress(self, k, n):
         """
@@ -47 +47 @@
 
         t = time.time()
-        p = int((100*k)//n)
-        
+        p = int((100 * k) // n)
+
         # Show improvements if there are any
         dt = t - self.improvement_time
@@ -56 +56 @@
             self.isbetter = False
             self.improvement_time = t
-       
+
         # Update percent complete
-        dp = p-self.progress_percent
+        dp = p - self.progress_percent
         if dp < 1: return
         dt = t - self.progress_time
@@ -67 +67 @@
                 self.update_fit()
             elif 2 < dp <= 5:
-                if p//5 != self.progress_percent//5:
+                if p // 5 != self.progress_percent // 5:
                     self.progress_percent = p
                     self.progress_time = t
             else:
-                if p//10 != self.progress_percent//10:
+                if p // 10 != self.progress_percent // 10:
                     self.progress_percent = p
                     self.progress_time = t
                     self.update_fit()
-        
+
     def improvement(self):
         """
@@ -82 +82 @@
         """
         self.isbetter = True
-    
+
     def print_result(self):
         """
@@ -89 +89 @@
         msg = " \n %s \n" % str(self.result)
         wx.PostEvent(self.parent, StatusEvent(status=msg))
-                     
+
     def error(self, msg):
         """
@@ -112 +112 @@
         wx.PostEvent(self.parent, StatusEvent(status=message,
                                    info="info", type="stop"))
-        
+
     def finalize(self):
         """
@@ -126 +126 @@
             #self.result.print_summary()
             self.update_fit()
-            
-        
+
+
     def update_fit(self, last=False):
         """
         """
         t1 = time.time()
-        self.elapsed_time =  t1 - self.update_duration
+        self.elapsed_time = t1 - self.update_duration
         self.update_duration = t1
         self.fit_duration += self.elapsed_time
@@ -147 +147 @@
                 d_flag = (hasattr(self.result, "data") and \
                     self.result.data is not None and \
-                    hasattr(self.result.data, "sas_data") and 
+                    hasattr(self.result.data, "sas_data") and
                     self.result.data.sas_data is not None)
                 m_flag = (hasattr(self.result, "model") and \
@@ -156 +156 @@
                     model_name = str(self.result.model.name)
                 if m_flag and d_flag:
-                    msg += "Data : %s \n"  % (str(data_name))#,
+                    msg += "Data : %s \n" % (str(data_name))#,
                                                      #str(model_name))
-                msg +=  str(self.result)
+                msg += str(self.result)
                 msg += "\n"
             else:
@@ -164 +164 @@
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
                                               type="progress"))
-     
+
     def starting_fit(self):
         """
         """
         wx.PostEvent(self.parent, StatusEvent(status="Starting the Fit...",
-                                        info="info",type="progress"))
-        
+                                        info="info", type="progress"))
+
     def set_result(self, result):
         """
         """
         self.result = result
-    
+
     def get_result(self):
         """
         """
         return self.result
-        
-    
+
+