Changeset fb7180c in sasview

Timestamp:

May 7, 2014 6:50:18 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:

e544c84

Parents:

f121904

Message:

enable park constrained fit test

Files:

• park-1.2.1/park/parameter.py (modified) (5 diffs)
• src/sans/fit/AbstractFitEngine.py (modified) (3 diffs)
• src/sans/fit/BumpsFitting.py (modified) (1 diff)
• src/sans/fit/ParkFitting.py (modified) (4 diffs)
• src/sans/perspectives/fitting/simfitpage.py (modified) (1 diff)
• test/park_integration/test/utest_fit_cylinder.py (moved) (moved from test/park_integration/test/test_fit_cylinder.py) (2 diffs)

park-1.2.1/park/parameter.py

@@ -15 +15 @@
 __all__ = ['Parameter', 'ParameterSet']
 
+import math
 import numpy
 import expression        
@@ -162 +163 @@
         """
         range = ['.']*10
-        lo,hi = p.range
-        portion = (p.value-lo)/(hi-lo)
+        lo,hi = self.range
+        portion = (self.value-lo)/(hi-lo)
         if portion < 0: portion = 0.
         elif portion >= 1: portion = 0.99999999
@@ -169 +170 @@
         range[bar] = '|'
         range = "".join(range)
-        return "%25s %s %g in [%g,%g]"  % (p.name,range,p.value,lo,hi)
+        return "%25s %s %g in [%g,%g]"  % (self.name,range,self.value,lo,hi)
 
     def isfitted(self): return self.status == 'fitted'
@@ -273 +274 @@
         for p in self:
             if parts[1] == p.name:
-                if len(pars) == 2:
+                if len(parts) == 2:
                     return p
                 elif isinstance(p, ParameterSet):
                     return p._byname(parts[1:])
+                else:
+                    raise
         return None
 
@@ -283 +286 @@
         parts = name.split('.')
         if parts[0] == self.name:
-            p =  _byname(self, name.split('.'))
+            p =  self._byname(name.split('.'))
             if p: return p
         raise KeyError("parameter %s not in parameter set"%name)

src/sans/fit/AbstractFitEngine.py

@@ -428 +428 @@
 
         sasmodel = model.model
-        if len(constraints) > 0:
-            for constraint in constraints:
-                name, value = constraint
-                try:
-                    model.parameterset[str(name)].set(str(value))
-                except:
-                    msg = "Fit Engine: Error occurs when setting the constraint"
-                    msg += " %s for parameter %s " % (value, name)
-                    raise ValueError, msg
-                
+        model.constraints = constraints
+
         if len(pars) > 0:
             temp = []
@@ -610 +602 @@
     def __init__(self, model=None, param_list=None, data=None):
         self.calls = None
-        self.pars = []
         self.fitness = None
         self.chisqr = None
@@ -621 +612 @@
         self.residuals = []
         self.index = []
-        self.parameters = None
         self.model = model
         self.data = data

src/sans/fit/BumpsFitting.py

@@ -182 +182 @@
         """
         # Note: technically, unbounded fitters and unmonitored fitters are
-        self.setp(x)
+        self.setp(p)
 
         # Compute penalty for being out of bounds which increases the farther

src/sans/fit/ParkFitting.py

@@ -122 +122 @@
         """
         list_params = []
-        self.pars = []
         self.pars = fitparams
         for item in fitparams:
@@ -501 +500 @@
             if fproblem.get_to_fit() == 1:
                 fitproblems.append(fproblem)
-        if len(fitproblems) == 0: 
+        if len(fitproblems) == 0:
             raise RuntimeError, "No Assembly scheduled for Park fitting."
-            return
         for item in fitproblems:
             model = item.get_model()
@@ -512 +510 @@
                     ind = item.pars.index(name)
                     parkmodel.model.setParam(name, item.vals[ind])
+
+            # set the constraints into the model
+            for p,v in model.constraints:
+                parkmodel.parameterset[str(p)].set(str(v))
             
             for p in parkmodel.parameterset:
                 ## does not allow status change for constraint parameters
                 if p.status != 'computed':
-                    if p.get_name()in item.pars:
+                    if p.get_name() in item.pars:
                         ## make parameters selected for 
                         #fit will be between boundaries
@@ -583 +585 @@
             if result is not None:
                 for p in result.parameters:
-                    if p.data.name == small_result.data.name and \
-                            p.model.name == small_result.model.name:
+                    #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

src/sans/perspectives/fitting/simfitpage.py

@@ -378 +378 @@
         box_description = wx.StaticBox(self, -1,"Easy Setup ")
         boxsizer = wx.StaticBoxSizer(box_description, wx.HORIZONTAL)     
-        sizer_constraint = wx.BoxSizer(wx.HORIZONTAL|wx.LEFT|wx.RIGHT|wx.EXPAND)
+        sizer_constraint = wx.BoxSizer(wx.HORIZONTAL)
         self.model_cbox_left = wx.ComboBox(self, -1, style=wx.CB_READONLY)
         self.model_cbox_left.Clear()

test/park_integration/test/utest_fit_cylinder.py

@@ -100 +100 @@
         fitter.set_data(self.data1,1)
         fitter.set_model(self.model1, 1, ['length','radius','scale'])
-        
+
         fitter.set_data(self.data2,2)
         fitter.set_model(self.model2, 2, ['radius','scale'])
@@ -110 +110 @@
     def test_park2(self):
         """ Simultaneous cylinder model fit (park)  """
-        raise NotImplementedError()
-        result1,= self._fit('park')
+        result1, result2 = self._fit('park')
         self.assert_(result1)
-        self.assertTrue(len(result1.pvec)>=0  )
-        self.assertTrue(len(result1.stderr)>= 0)
-      
-        for par in result1.parameters:
-            if par.name=='C1.length':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-400.0)/3.0 < par.stderr )
-            elif par.name=='C1.radius':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-20.0)/3.0 < par.stderr )
-            elif par.name=='C2.radius':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-40.0)/3.0 < par.stderr )
-            elif par.name=='C1.scale':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-1.0)/3.0 < par.stderr )
-            elif par.name=='C2.scale':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-1.0)/3.0 < par.stderr )
-            
+        self.assertTrue(len(result1.pvec)>0)
+        self.assertTrue(len(result1.stderr)>0)
+
+        for n, v, dv in zip(result1.param_list, result1.pvec, result1.stderr):
+            print "M1.%s = %s +/- %s"%(n,v,dv)
+            if n == "length":
+                self.assertTrue( math.fabs(v-400.0)/3.0 < dv )
+            elif n=='radius':
+                self.assertTrue( math.fabs(v-20.0)/3.0 < dv )
+            elif n=='scale':
+                self.assertTrue( math.fabs(v-1.0)/3.0 < dv )
+        for n, v, dv in zip(result2.param_list, result2.pvec, result2.stderr):
+            print "M2.%s = %s +/- %s"%(n,v,dv)
+            if n=='radius':
+                self.assertTrue( math.fabs(v-40.0)/3.0 < dv )
+            elif n=='scale':
+                self.assertTrue( math.fabs(v-1.0)/3.0 < dv )
+
 
 if __name__ == '__main__':