Changeset 8d074d9 in sasview for src/sans

Timestamp:

May 8, 2014 4:19:04 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:

76f132a

Parents:

4de1fed

Message:

refactor fit internals, enabling disperser parameters

Location:

src/sans/fit

Files:

• AbstractFitEngine.py (modified) (3 diffs)
• BumpsFitting.py (modified) (1 diff)
• ParkFitting.py (modified) (10 diffs)
• ScipyFitting.py (modified) (2 diffs)

src/sans/fit/AbstractFitEngine.py

@@ -421 +421 @@
         
         """
-        if model == None:
-            raise ValueError, "AbstractFitEngine: Need to set model to fit"
-        
+        if not pars:
+            raise ValueError("no fitting parameters")
+
+        if model is None:
+            raise ValueError("no model to fit")
+
         if not issubclass(model.__class__, Model):
             model = Model(model, data)
 
         sasmodel = model.model
-        model.constraints = constraints
-
-        if len(pars) > 0:
-            temp = []
-            for item in pars:
-                if item in sasmodel.getParamList():
-                    temp.append(item)
-                    self.param_list.append(item)
-                else:
-                    
-                    msg = "wrong parameter %s used " % str(item)
-                    msg += "to set model %s. Choose " % str(sasmodel.name)
-                    msg += "parameter name within %s" % \
-                                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(model)
-                self.fit_arrange_dict[id].pars = pars
-            else:
-            #no fitArrange object has been create with this id
-                fitproblem = FitArrange()
-                fitproblem.set_model(model)
-                fitproblem.pars = pars
-                self.fit_arrange_dict[id] = fitproblem
-                vals = []
-                for name in pars:
-                    vals.append(sasmodel.getParam(name))
-                self.fit_arrange_dict[id].vals = vals
-        else:
-            raise ValueError, "park_integration:missing parameters"
-    
+        available_parameters = sasmodel.getParamList()
+        for p in pars:
+            if p not in available_parameters:
+                raise ValueError("parameter %s not available in model %s; use one of [%s] instead"
+                                 %(p, sasmodel.name, ", ".join(available_parameters)))
+
+        if id not in self.fit_arrange_dict:
+            self.fit_arrange_dict[id] = FitArrange()
+
+        self.fit_arrange_dict[id].set_model(model)
+        self.fit_arrange_dict[id].pars = pars
+        self.fit_arrange_dict[id].vals = [sasmodel.getParam(name) for name in pars]
+        self.fit_arrange_dict[id].constraints = constraints
+
+        self.param_list.extend(pars)
+
     def set_data(self, data, id, smearer=None, qmin=None, qmax=None):
         """
@@ -542 +528 @@
         self.vals = []
         self.selected = 0
-        
+
     def set_model(self, model):
         """
@@ -594 +580 @@
         """
         return self.selected
-    
-    
+
 class FResult(object):
     """

src/sans/fit/BumpsFitting.py

@@ -121 +121 @@
         return the range of parameter
         """
-        lo, hi = self.model.details[p][1:3]
+        lo, hi = self.model.details.get(p,["",None,None])[1:3]
         if lo is None: lo = -numpy.inf
         if hi is None: hi = numpy.inf

src/sans/fit/ParkFitting.py

@@ -37 +37 @@
         """
         park.Parameter.__init__(self, name)
-        self._model, self._name = model, name
+        #self._model, self._name = model, name
         self.data = data
         self.model = model
@@ -43 +43 @@
         self.set(model.getParam(name))
 
+        # TODO: model is missing parameter ranges for dispersion parameters
+        if name not in model.details:
+            #print "setting details for",name
+            model.details[name] = ["", None, None]
+
     def _getvalue(self):
         """
@@ -50 +55 @@
 
         """
-        return self._model.getParam(self.name)
+        return self.model.getParam(self.name)
 
     def _setvalue(self, value):
@@ -59 +64 @@
 
         """
-        self._model.setParam(self.name, value)
+        self.model.setParam(self.name, value)
 
     value = property(_getvalue, _setvalue)
@@ -69 +74 @@
         """
         #if not  self.name in self._model.getDispParamList():
-        lo, hi = self._model.details[self.name][1:3]
+        lo, hi = self.model.details[self.name][1:3]
         if lo is None: lo = -numpy.inf
         if hi is None: hi = numpy.inf
@@ -89 +94 @@
 
         """
-        self._model.details[self.name][1:3] = r
+        self.model.details[self.name][1:3] = r
     range = property(_getrange, _setrange)
 
@@ -505 +510 @@
             model = item.get_model()
             parkmodel = ParkModel(model.model, model.data)
+            parkmodel.pars = item.pars
             if reset_flag:
                 # reset the initial value; useful for batch
@@ -512 +518 @@
 
             # set the constraints into the model
-            for p,v in model.constraints:
+            for p,v in item.constraints:
                 parkmodel.parameterset[str(p)].set(str(v))
             
@@ -571 +577 @@
         except LinAlgError:
             raise ValueError, "SVD did not converge"
+
+        if result is None:
+            raise RuntimeError("park did not return a fit result")
     
         for m in self.problem.parts:
@@ -578 +587 @@
             small_result.theory = theory
             small_result.residuals = residuals
-            small_result.pvec = []
-            small_result.cov = []
-            small_result.stderr = []
-            small_result.param_list = []
-            small_result.residuals = m.residuals
-            if result is not None:
-                for p in result.parameters:
-                    #if p.data.name == small_result.data.name and
-                    if p.model.name == small_result.model.name:
-                        small_result.index = m.data.idx
-                        small_result.fitness = result.fitness
-                        small_result.pvec.append(p.value)
-                        small_result.stderr.append(p.stderr)
-                        name_split = p.name.split('.')
-                        name = name_split[1].strip()
-                        if len(name_split) > 2:
-                            name += '.' + name_split[2].strip()
-                        small_result.param_list.append(name)
-                # normalize chisq by degrees of freedom
-                small_result.fitness /= len(small_result.residuals)-len(small_result.pvec)
+            small_result.index = m.data.idx
+            small_result.fitness = result.fitness
+
+            # Extract the parameters that are part of this model; make sure
+            # they match the fitted parameters for this model, and place them
+            # in the same order as they occur in the model.
+            pars = {}
+            for p in result.parameters:
+                #if p.data.name == small_result.data.name and
+                if p.model.name == small_result.model.name:
+                    model_name, par_name = p.name.split('.', 1)
+                    pars[par_name] = (p.value, p.stderr)
+            #assert len(pars.keys()) == len(m.model.pars)
+            v,dv = zip(*[pars[p] for p in m.model.pars])
+            small_result.pvec = v
+            small_result.stderr = dv
+            small_result.param_list = m.model.pars
+
+            # normalize chisq by degrees of freedom
+            dof = len(small_result.residuals)-len(small_result.pvec)
+            small_result.fitness = numpy.sum(residuals**2)/dof
+
             result_list.append(small_result)    
         if q != None:

src/sans/fit/ScipyFitting.py

@@ -206 +206 @@
         
         result = FResult(model=model.model, data=data, param_list=self.param_list)
-        result.pars = fitproblem[0].pars
         result.fitter_id = self.fitter_id
         if handler is not None:
@@ -268 +267 @@
     for p in param_list:
         value = model.getParam(p)
-        low,high = model.details[p][1:3]
+        low,high = model.details.setdefault(p,["",None,None])[1:3]
         # if the range was defined, check the range
         if low is not None and value <= low: