Changeset 26e4a24 in sasview for sansmodels/src/sans/models/test

Timestamp:

Aug 7, 2009 11:24:39 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

ecc58e72

Parents:

58c6ba6

Message:

reverse previous unittest

Location:

sansmodels/src/sans/models/test

Files:

• utest_dispersity.py (modified) (1 diff)
• utest_models.py (modified) (1 diff)
• utest_other_dispersity.py (added)

sansmodels/src/sans/models/test/utest_dispersity.py

@@ -57 +57 @@
         
         new_model = self.model.clone()
-        print "gaussian",self.model.run(0.001)
         self.assertAlmostEqual(new_model.run(0.001), 4723.32213339, 3)
         self.assertAlmostEqual(new_model.runXY([0.001,0.001]), 4743.56, 2)
-        
-    def test_schulz_zero(self):
-        from sans.models.dispersion_models import SchulzDispersion
-        disp = SchulzDispersion()
-        self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
-        #self.model.dispersion['radius']['width'] = 0.0
-        self.model.dispersion['radius']['npts'] = 100
-        #self.model.setParam('scale', 1.0)
-        self.model.setParam('scale', 10.0)
-        print "schulz",self.model.run(0.001), self.model.dispersion
-        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
-        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
-        
-    def test_lognormal_zero(self):
-        from sans.models.dispersion_models import LogNormalDispersion
-        disp = LogNormalDispersion()
-        self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
-        #self.model.dispersion['radius']['width'] = 0.0
-        self.model.dispersion['radius']['npts'] = 100
-        #self.model.setParam('scale', 1.0)
-        self.model.setParam('scale', 10.0)
-        print "model dispersion",self.model.dispersion
-        print "lognormal",self.model.run(0.001)
-        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
-        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
         
     def test_gaussian_zero(self):

sansmodels/src/sans/models/test/utest_models.py

@@ -24 +24 @@
     def test1D(self):
         """ Test 1D model for a sphere """
-        self.assertAlmostEqual(self.comp.run(1.0), 5.6387e-5, 4)
+        self.assertAlmostEqual(self.comp.run(1.0), 56.3878, 4)
         
     def test1D_2(self):
         """ Test 2D model for a sphere """
-        self.assertAlmostEqual(self.comp.run([1.0, 1.3]), 5.63878e-5, 4)
+        self.assertAlmostEqual(self.comp.run([1.0, 1.3]), 56.3878, 4)
 
 class TestCyl(unittest.TestCase):