Changeset 95d58d3 in sasview for src/sans/fit/AbstractFitEngine.py

Timestamp:

Apr 10, 2014 8:05:28 PM (11 years ago)

Author:

pkienzle

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:

90f49a8

Parents:

6fe5100

Message:

fix fit line test for bumps/scipy/park and enable it as part of test suite

File:

• src/sans/fit/AbstractFitEngine.py (modified) (10 diffs)

src/sans/fit/AbstractFitEngine.py

@@ -58 +58 @@
         Fit was aborted.
         """
+
+    # TODO: not sure how these are used, but they are needed for running the fit
+    def update_fit(self, last=False): pass
+    def set_result(self, result=None): self.result = result
 
 class Model:
@@ -217 +221 @@
         """
         return self.qmin, self.qmax
-        
+
+    def size(self):
+        """
+        Number of measurement points in data set after masking, etc.
+        """
+        return len(self.x)
+
     def residuals(self, fn):
         """
@@ -259 +269 @@
     def __init__(self, sans_data2d, data=None, err_data=None):
         Data2D.__init__(self, data=data, err_data=err_data)
-        """
-            Data can be initital with a data (sans plottable)
-            or with vectors.
-        """
+        # Data can be initialized with a sans plottable or with vectors.
         self.res_err_image = []
-        self.num_points = data.size
+        self.num_points = 0 # will be set by set_data
         self.idx = []
         self.qmin = None
@@ -306 +313 @@
         self.idx = (self.idx) & (self.mask)
         self.idx = (self.idx) & (numpy.isfinite(self.data))
+        self.num_points = numpy.sum(self.idx)
 
     def set_smearer(self, smearer):
@@ -339 +347 @@
         """
         return self.qmin, self.qmax
-     
+
+    def size(self):
+        """
+        Number of measurement points in data set after masking, etc.
+        """
+        return numpy.sum(self.idx)
+
     def residuals(self, fn):
         """
@@ -410 +424 @@
             raise ValueError, "AbstractFitEngine: Need to set model to fit"
         
-        new_model = model
         if not issubclass(model.__class__, Model):
-            new_model = Model(model, data)
-        
+            model = Model(model, data)
+
+        sasmodel = model.model
         if len(constraints) > 0:
             for constraint in constraints:
                 name, value = constraint
                 try:
-                    new_model.parameterset[str(name)].set(str(value))
+                    model.parameterset[str(name)].set(str(value))
                 except:
                     msg = "Fit Engine: Error occurs when setting the constraint"
@@ -427 +441 @@
             temp = []
             for item in pars:
-                if item in new_model.model.getParamList():
+                if item in sasmodel.getParamList():
                     temp.append(item)
                     self.param_list.append(item)
@@ -433 +447 @@
                     
                     msg = "wrong parameter %s used " % str(item)
-                    msg += "to set model %s. Choose " % str(new_model.model.name)
+                    msg += "to set model %s. Choose " % str(sasmodel.name)
                     msg += "parameter name within %s" % \
-                                str(new_model.model.getParamList())
+                                str(sasmodel.getParamList())
                     raise ValueError, msg
               
             #A fitArrange is already created but contains data_list only at id
             if self.fit_arrange_dict.has_key(id):
-                self.fit_arrange_dict[id].set_model(new_model)
+                self.fit_arrange_dict[id].set_model(model)
                 self.fit_arrange_dict[id].pars = pars
             else:
             #no fitArrange object has been create with this id
                 fitproblem = FitArrange()
-                fitproblem.set_model(new_model)
+                fitproblem.set_model(model)
                 fitproblem.pars = pars
                 self.fit_arrange_dict[id] = fitproblem
                 vals = []
                 for name in pars:
-                    vals.append(new_model.model.getParam(name))
+                    vals.append(sasmodel.getParam(name))
                 self.fit_arrange_dict[id].vals = vals
         else:
@@ -634 +648 @@
             return "No results"
 
-        pars = enumerate(self.model.model.getParamList())
+        sasmodel = self.model.model
+        pars = enumerate(sasmodel.getParamList())
         msg1 = "[Iteration #: %s ]" % self.iterations
         msg3 = "=== goodness of fit: %s ===" % (str(self.fitness))
-        msg2 = ["P%-3d  %s......|.....%s" % (i, v, self.model.model.getParam(v))
+        msg2 = ["P%-3d  %s......|.....%s" % (i, v, sasmodel.getParam(v))
                 for i,v in pars if v in self.param_list]
         msg = [msg1, msg3] + msg2
@@ -645 +660 @@
         """
         """
-        print self
+        print str(self)