Changeset 76f132a in sasview

Timestamp:

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

e3efa6b3

Parents:

8d074d9

Message:

test resolution and dispersion

Location:

test

Files:

• park_integration/test/utest_fit_line.py (modified) (3 diffs)
• park_integration/test/utest_fit_smeared.py (moved) (moved from test/park_integration/test/test_fit_smeared.py) (9 diffs)
• park_integration/test/utest_small_test.py (modified) (1 diff)
• run_one.py (modified) (1 diff)

test/park_integration/test/utest_fit_line.py

@@ -30 +30 @@
         except ValueError,exc:
             #print "ValueError was correctly raised: "+str(msg)
-            assert str(exc).startswith('wrong parameter')
+            assert str(exc).startswith('parameter param1')
         else:
             raise AssertionError("No error raised for scipy fitting with wrong parameters name to fit")
@@ -54 +54 @@
         # The target values were generated from the following statements
         p,s,fx = result1.pvec, result1.stderr, result1.fitness
-        #print "p0,p1,s0,s1,fx_ = %g, %g, %g, %g, %g"%(p[0],p[1],s[0],s[1],fx)
+        #print "p0,p1,s0,s1,fx = %g, %g, %g, %g, %g"%(p[0],p[1],s[0],s[1],fx)
         p0,p1,s0,s1,fx_ = 3.68353, 2.61004, 0.336186, 0.105244, 1.20189
 
@@ -65 +65 @@
             self.assertTrue( abs(p[0]-p0) <= 1e-5 )
             self.assertTrue( abs(p[1]-p1) <= 1e-5 )
-            self.assertTrue( abs(fx-fx_) <= 1e-2 )
+            self.assertTrue( abs(fx-fx_) <= 1e-5 )
 
     def fit_bumps(self, alg, **opts):

test/park_integration/test/utest_fit_smeared.py

@@ -21 +21 @@
         out=Loader().load("cyl_400_20.txt")
         # This data file has not error, add them
-        out.dy = out.y
+        #out.dy = out.y
         
         fitter = Fit('scipy')
@@ -28 +28 @@
         # Receives the type of model for the fitting
         model1  = CylinderModel()
-        model1.setParam('sldCyl', 3.0e-6)
-        model1.setParam('sldSolv', 0.0)
+        model1.setParam("scale", 1.0)
+        model1.setParam("radius",18)
+        model1.setParam("length", 397)
+        model1.setParam("sldCyl",3e-006 )
+        model1.setParam("sldSolv",0.0 )
+        model1.setParam("background", 0.0)
         model = Model(model1)
-        model.set(scale=1e-10)
         pars1 =['length','radius','scale']
         fitter.set_model(model,1,pars1)
@@ -38 +41 @@
         fitter.select_problem_for_fit(id=1,value=1)
         result1, = fitter.fit()
-        
+        #print "result1",result1
+
         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(len(result1.pvec) > 0)
+        self.assertTrue(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]-9.0e-12)/3.0   < result1.stderr[2] )
+        self.assertTrue( math.fabs(result1.pvec[2]-1)/3.0   < result1.stderr[2] )
         self.assertTrue( result1.fitness < 1.0 )
-        
+
+    def test_park_dispersion(self):
+        """
+            Cylinder fit with dispersion
+        """
+        self._dispersion(fitter = Fit('park'))
+
+    def test_bumps_dispersion(self):
+        """
+            Cylinder fit with dispersion
+        """
+        alg = 'amoeba'
+        from bumps import fitters
+        fitters.FIT_DEFAULT = alg
+        #fitters.FIT_OPTIONS[alg].options.update(opts)
+        fitters.FIT_OPTIONS[alg].options.update(monitors=[])
+        self._dispersion(fitter = Fit('bumps'))
+
     def test_scipy_dispersion(self):
         """
             Cylinder fit with dispersion
         """
+        self._dispersion(fitter = Fit('scipy'))
+
+    def _dispersion(self, fitter):
         # Load data
         # This data is for a cylinder with 
@@ -60 +84 @@
             out.dy[i] = math.sqrt(out.y[i])
         
-        # Set up the fit
-        fitter = Fit('scipy')
         # Receives the type of model for the fitting
         model1  = CylinderModel()
-        model1.setParam('sldCyl', 3.0e-6)
-        model1.setParam('sldSolv', 0.0)
+        model1.setParam("scale", 10.0)
+        model1.setParam("radius",18)
+        model1.setParam("length", 397)
+        model1.setParam("sldCyl",3e-006 )
+        model1.setParam("sldSolv",0.0 )
+        model1.setParam("background", 0.0)
 
         # Dispersion parameters
-        model1.dispersion['radius']['width'] = 0.001
-        model1.dispersion['radius']['npts'] = 50        
-        
+        model1.dispersion['radius']['width'] = 0.25
+        model1.dispersion['radius']['npts'] = 50
+
         model = Model(model1)
-        
+
         pars1 =['length','radius','scale','radius.width']
         fitter.set_data(out,1)
-        model.set(scale=1e-10)
         fitter.set_model(model,1,pars1)
         fitter.select_problem_for_fit(id=1,value=1)
@@ -81 +106 @@
         
         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.0e-10)/3.0   < result1.stderr[2] )
-        self.assertTrue( math.fabs(result1.pvec[3]-5.0)/3.0   < result1.stderr[3] )
+        self.assertTrue(len(result1.pvec)>0)
+        self.assertTrue(len(result1.stderr)>0)
+
+        self.assertTrue( math.fabs(result1.pvec[0]-399.8)/3.0 < result1.stderr[0] )
+        self.assertTrue( math.fabs(result1.pvec[1]-17.5)/3.0  < result1.stderr[1] )
+        self.assertTrue( math.fabs(result1.pvec[2]-11.1)/3.0   < result1.stderr[2] )
+        self.assertTrue( math.fabs(result1.pvec[3]-0.276)/3.0   < result1.stderr[3] )
         self.assertTrue( result1.fitness < 1.0 )
         
@@ -98 +123 @@
     """
     def setUp(self):
-        print "TEST DONE WITHOUT PROPER OUTPUT CHECK:"
-        print "   ---> TEST NEEDS TO BE COMPLETED"
         data = Loader().load("latex_smeared.xml")
         self.data_res = data[0]
@@ -105 +128 @@
         
         self.sphere = SphereModel()
+        self.sphere.setParam('background', 0)
         self.sphere.setParam('radius', 5000.0)
-        self.sphere.setParam('scale', 1.0e-13)
-        self.sphere.setParam('radius.npts', 30)
-        self.sphere.setParam('radius.width',500)
-        
+        self.sphere.setParam('scale', 0.4)
+        self.sphere.setParam('sldSolv',0)
+        self.sphere.setParam('sldSph',1e-6)
+        #self.sphere.setParam('radius.npts', 30)
+        #self.sphere.setParam('radius.width',50)
+
     def test_reso(self):
 
@@ -125 +151 @@
         fitter.set_data(self.data_res,1)
         fitter._engine.fit_arrange_dict[1].data_list[0].smearer = smear
-        print "smear ",smear
+
         # Model: maybe there's a better way to do this.
         # Ideally we should have to create a new model from our sans model.
-        fitter.set_model(Model(self.sphere),1, ['radius','scale'])
+        fitter.set_model(Model(self.sphere),1, ['radius','scale', 'background'])
         
         # Why do we have to do this...?
         fitter.select_problem_for_fit(id=1,value=1)
-        
+
         # Perform the fit (might take a while)
         result1, = fitter.fit()
         
-        # Replace this with proper test once we know what the
-        # result should be 
-        print result1.pvec
-        print result1.stderr
-        
+        #print "v",result1.pvec
+        #print "dv",result1.stderr
+        #print "chisq(v)",result1.fitness
+
+        self.assertTrue( math.fabs(result1.pvec[0]-5000) < 20 )
+        self.assertTrue( math.fabs(result1.pvec[1]-0.48) < 0.02 )
+        self.assertTrue( math.fabs(result1.pvec[2]-0.060)  < 0.002 )
+
+
     def test_slit(self):
         smear = smear_selection(self.data_slit)
         self.assertEqual(smear.__class__.__name__, 'SlitSmearer')
 
-        # Fit
         fitter = Fit('scipy')
         
@@ -161 +190 @@
         result1, = fitter.fit()
         
-        # Replace this with proper test once we know what the
-        # result should be 
-        print result1.pvec
-        print result1.stderr
-        
-       
-       
+        #print "v",result1.pvec
+        #print "dv",result1.stderr
+        #print "chisq(v)",result1.fitness
+        
+        self.assertTrue( math.fabs(result1.pvec[0]-2340) < 20 )
+        self.assertTrue( math.fabs(result1.pvec[1]-0.010) < 0.002 )
+
 if __name__ == '__main__':
     unittest.main()

test/park_integration/test/utest_small_test.py

@@ -27 +27 @@
         fitter.select_problem_for_fit(id=1,value=1)
         result1, = fitter.fit()
-        
+        #print result1
+        #print result1.__dict__
+
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>0 or len(result1.pvec)==0 )

test/run_one.py

@@ -12 +12 @@
 run.prepare()
 #print "\n".join(sys.path)
-test_path,test_file = splitpath(sys.argv[1])
+test_path,test_file = splitpath(abspath(sys.argv[1]))
 print "=== testing:",sys.argv[1]
 #print test_path, test_file