Changeset 444c900e in sasview for park_integration/src/sans/fit/ScipyFitting.py

Timestamp:

Oct 11, 2011 5:51:37 PM (13 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:

6a4002d

Parents:

d59cb8c

Message:

make sure result similar for both engine

File:

• park_integration/src/sans/fit/ScipyFitting.py (modified) (3 diffs)

park_integration/src/sans/fit/ScipyFitting.py

@@ -15 +15 @@
 from sans.fit.AbstractFitEngine import FitAbort
 from sans.fit.AbstractFitEngine import Model
-IS_MAC = True
-if sys.platform.count("win32") > 0:
-    IS_MAC = False
-    
-class fitresult(object):
-    """
-    Storing fit result
-    """
-    def __init__(self, model=None, param_list=None, data=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.is_mac = IS_MAC
-        if issubclass(model.__class__, Model):
-            model = model.model
-        self.model = model
-        self.data = data
-        self.theory = None
-        self.param_list = param_list
-        self.iterations = 0
-        
-        self.inputs = [(self.model, self.data)]
-     
-    def set_model(self, model):
-        """
-        """
-        self.model = model
-        
-    def set_fitness(self, fitness):
-        """
-        """
-        self.fitness = fitness
-        
-    def __str__(self):
-        """
-        """
-        if self.pvec == None and self.model is None and self.param_list is None:
-            return "No results"
-        n = len(self.model.parameterset)
-        self.iterations += 1
-        result_param = zip(xrange(n), self.model.parameterset)
-        msg1 = ["[Iteration #: %s ]" % self.iterations]
-        msg3 = ["=== goodness of fit: %s ===" % (str(self.fitness))]
-        if not self.is_mac:
-            msg2 = ["P%-3d  %s......|.....%s" % \
-                (p[0], p[1], p[1].value)\
-                  for p in result_param if p[1].name in self.param_list]
-            msg =  msg1 + msg3 + msg2
-        else:
-            msg = msg1 + msg3
-        msg = "\n".join(msg)
-        return msg
-    
-    def print_summary(self):
-        """
-        """
-        print self   
+from sans.fit.AbstractFitEngine import FResult 
 
 class ScipyFit(FitEngine):
@@ -146 +83 @@
         self._check_param_range(model)
         
-        result = fitresult(model=model, data=data.sans_data, param_list=self.param_list)
+        result = FResult(model=model, data=data, param_list=self.param_list)
         if handler is not None:
             handler.set_result(result=result)
@@ -197 +134 @@
             if success < 1 or success > 5:
                 result = None
-            return result
+        return [result]
+        """
         else:
             return None
+        """
         # Error will be present to the client, not here 
         #else: