Changeset 543d1bd in sasview for sansmodels/test/utest_other_models.py

Timestamp:

Feb 27, 2012 6:27: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:

996c643

Parents:

015eb2b

Message:

Added coreshellbicelle model

File:

• sansmodels/test/utest_other_models.py (modified) (2 diffs)

sansmodels/test/utest_other_models.py

@@ -272 +272 @@
     #    self.assert_(numpy.isfinite(self.comp.run(0.0)))
  
- 
+     
+class TestCoreShellBicelleModel(unittest.TestCase):
+    """ Unit tests for CoreShellBicelle Model"""
+    
+    def setUp(self):
+        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
+        from sans.models.CoreShellBicelleModel import CoreShellBicelleModel
+        self.comp1 = CoreShellCylinderModel()
+        self.comp2 = CoreShellBicelleModel()
+        # Using the default values of CSBiselle is same as CSCylinder
+        
+    def testcompare1D(self):
+        """ Test 1D model for a CoreShellBicelle Model"""
+        self.assertAlmostEqual(self.comp1.run(0.01), self.comp2.run(0.01), 8)
+        
+    def testcompareEval_2D(self):
+        """ Test 2D model for a CoreShellBicelle with evalDistribution"""
+        self.assertAlmostEquals(self.comp1.runXY([0.4, 0.5]),self.comp2.runXY([0.4, 0.5]),8)
+        self.assertAlmostEquals(self.comp1.runXY([1.3,1.57]),self.comp2.runXY([1.3,1.57]),8)
+        
+                      
 class TestHollowCylinderModel(unittest.TestCase):
     """ Unit tests for HollowCylinder Model"""
@@ -318 +338 @@
         """ Test 2D model for a HollowCylinder with evalDistribution"""
         self.assertAlmostEquals(self.comp.runXY([0.4, 0.5]),self.xy_matrix[0],8)
-        self.assertAlmostEquals(self.comp.runXY([1.3,1.57]),self.xy_matrix[1], 8)
+        self.assertAlmostEquals(self.comp.runXY([1.3,1.57]),self.xy_matrix[1],8)
 
     # No more singular point