Changeset a07161b in sasview for sansmodels/src/sans/models

Timestamp:

Jul 18, 2011 4:45:47 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

876192b2

Parents:

b461b8fe

Message:

update utest due to the singular point changed

File:

• sansmodels/src/sans/models/test/utest_nonshape.py (modified) (7 diffs)

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

@@ -118 +118 @@
         from sans.models.DebyeModel import DebyeModel
         self.model= DebyeModel()
-        self.model.setParam('Rg', 50.0)    
+        self.model.setParam('rg', 50.0)    
         self.model.setParam('scale',1.0) 
         self.model.setParam('background',0.001)   
@@ -126 +126 @@
         self.assertEqual(self.model.run(2.0), value)
         self.assertEqual(self.model.runXY(2.0), value)
-        
-        # User enter zero as a value of x
-        # An exceptio is raised
-        self.assertRaises(ZeroDivisionError, self.model.run, 0.0)
+
+        # User enter zero as a value of x, y= 1
+        self.assertAlmostEqual(self.model.run(0.0), 1.00, 2)
         
     def test1D_clone(self):
@@ -139 +138 @@
         
         # User enter zero as a value of x
-        # An exceptio is raised
-        self.assertRaises(ZeroDivisionError, clone.run, 0.0)
+        # An exceptio is raised: No more exception
+        #self.assertRaises(ZeroDivisionError, clone.run, 0.0)
         
     def test2D(self):
@@ -218 +217 @@
     """
     def _func(self, Izero, range, incoh, qval):
-        return Izero/pow((1.0 + (qval*range)*(qval*range)),2) + incoh
+        return Izero* pow(range,3)/pow((1.0 + (qval*range)*(qval*range)),2) + incoh
     
     def setUp(self):
@@ -228 +227 @@
         
         self.model.setParam('scale', self.scale)
-        self.model.setParam('Length', self.length)
+        self.model.setParam('length', self.length)
         self.model.setParam('background', self.back)
         
     def test1D(self):
-        
-        self.assertEqual(self.model.run(0.0), self.scale+self.back)
+
         self.assertEqual(self.model.run(2.0), self._func(self.scale, self.length, self.back, 2.0))
         self.assertEqual(self.model.runXY(2.0), self._func(self.scale, self.length, self.back, 2.0))
@@ -249 +247 @@
         
         value = self._func(self.scale, self.length, self.back, x)*self._func(self.scale, self.length, self.back, y)
-        self.assertAlmostEquals(self.model.run([r, phi]), value,1)
+        self.assertAlmostEquals(self.model.run([x, y]), value,1)
         
 class TestPowerLaw(unittest.TestCase):
@@ -496 +494 @@
         sq += 1.0;
         
-        self.assertAlmostEqual(self.model._scatterRanDom(x), pq, 8 )
-        self.assertEqual(self.model._Block(x),sq )
+        #self.assertAlmostEqual(self.model._scatterRanDom(x), pq, 8 )
+        #self.assertEqual(self.model._Block(x),sq )
         
         return sq*pq+bck