Changeset 4e9f227 in sasview for test

Timestamp:

May 15, 2014 7:07:43 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:

786685e

Parents:

e3efa6b3

Message:

support simultaneous fitting in bumps

File:

• test/park_integration/test/utest_fit_cylinder.py (modified) (7 diffs)

test/park_integration/test/utest_fit_cylinder.py

@@ -10 +10 @@
 from sans.dataloader.loader import Loader
 
+#@unittest.skip("")
 class TestSingleFit(unittest.TestCase):
     """ test single fitting """
@@ -33 +34 @@
         fitter.set_model(self.model,1,self.pars1)
         fitter.select_problem_for_fit(id=1,value=1)
-        return  fitter.fit()
-       
+        result1, = fitter.fit()
 
-    def test_scipy(self):
-        """ Simple cylinder model fit (scipy)  """
-        
-        result1, = self._fit("scipy")
-        
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>0 or len(result1.pvec)==0 )
         self.assertTrue(len(result1.stderr)> 0 or len(result1.stderr)==0)
-        
+
         self.assertTrue( math.fabs(result1.pvec[0]-400.0)/3.0 < result1.stderr[0] )
         self.assertTrue( math.fabs(result1.pvec[1]-20.0)/3.0  < result1.stderr[1] )
         self.assertTrue( math.fabs(result1.pvec[2]-1.0)/3.0   < result1.stderr[2] )
         self.assertTrue( result1.fitness < 1.0 )
-        
-        
+
+
+    def test_scipy(self):
+        """ Simple cylinder model fit (scipy)  """
+        self._fit("scipy")
+
+
     def test_park(self):
         """ Simple cylinder model fit (park)  """
-        #raise NotImplementedError()
-        result1, = self._fit("park")
-        
-        self.assert_(result1)
-        self.assertTrue(len(result1.pvec)>0 or len(result1.pvec)==0 )
-        self.assertTrue(len(result1.stderr)> 0 or len(result1.stderr)==0)
-       
-        self.assertTrue( math.fabs(result1.pvec[0]-400.0)/3.0 < result1.stderr[0] )
-        self.assertTrue( math.fabs(result1.pvec[1]-20.0)/3.0  < result1.stderr[1] )
-        self.assertTrue( math.fabs(result1.pvec[2]-1.0)/3.0   < result1.stderr[2] )
-        self.assertTrue( result1.fitness < 1.0 )
-        
-        
+        self._fit("park")
+
+    def test_bumps(self):
+        """ Simple cylinder model fit (park)  """
+        self._fit("bumps")
+
+
         
 class TestSimultaneousFit(unittest.TestCase):
@@ -82 +76 @@
         self.model1.set(scale= 1.0)
         self.model1.set(radius=18)
-        self.model1.set(length=396)
+        self.model1.set(length=200)
         self.model1.set(sldCyl=3e-006, sldSolv=0.0)
         self.model1.set(background=0.0)
-        
+
         cyl2  = CylinderModel()
         cyl2.name = "C2"
@@ -91 +85 @@
         self.model2.set(scale= 1.0)
         self.model2.set(radius=37)
-        self.model2.set(length='C1.length')
+        self.model2.set(length=300)
         self.model2.set(sldCyl=3e-006, sldSolv=0.0)
         self.model2.set(background=0.0)
-       
 
-    def test_park2(self):
+
+    def test_constrained_bumps(self):
+        """ Simultaneous cylinder model fit (park)  """
+        self._run_fit(Fit('bumps'))
+
+    #@unittest.skip("")
+    def test_constrained_park(self):
         """ Simultaneous cylinder model fit (park)  """
         self._run_fit(Fit('park'))
@@ -107 +106 @@
 
         for n, v, dv in zip(result1.param_list, result1.pvec, result1.stderr):
-            print "M1.%s = %s +/- %s"%(n,v,dv)
+            print "%s M1.%s = %s +/- %s"%(fitter._engine.__class__.__name__,n,v,dv)
             if n == "length":
                 self.assertTrue( math.fabs(v-400.0)/3.0 < dv )
@@ -115 +114 @@
                 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)
+            print "%s M2.%s = %s +/- %s"%(fitter._engine.__class__.__name__,n,v,dv)
             if n=='radius':
                 self.assertTrue( math.fabs(v-40.0)/3.0 < dv )
@@ -127 +126 @@
 
         fitter.set_data(self.data2,2)
-        fitter.set_model(self.model2, 2, ['radius','scale'])
+        fitter.set_model(self.model2, 2, ['radius','scale'],
+                         constraints=[("length","C1.length")])
         fitter.select_problem_for_fit(id=1,value=1)
         fitter.select_problem_for_fit(id=2,value=1)