Changeset ae60f86 in sasview for sansmodels/src/sans/models/test

Timestamp:

Oct 14, 2008 6:13:28 AM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

8809e48

Parents:

4fe4394

Message:

changing base model

Location:

sansmodels/src/sans/models/test

Files:

• testcase_generator.py (modified) (2 diffs)
• utest_basemodels.py (deleted)
• utest_dispersity.py (modified) (2 diffs)
• utest_models.py (modified) (4 diffs)
• utest_newstylemodels.py (modified) (3 diffs)

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

@@ -2 +2 @@
     Random test-case generator for BaseComponents
     
-    @author: Mathieu Doucet / UTK
-    @license: This software is provided as part of the DANSE project.
 """
 import time
@@ -760 +758 @@
 
 if __name__ == '__main__':
-
+    print "Model operations are no longer supported."
+    print "The TestCase generator for model operation can't be used with this version of sansmodels." 
+    
+    
     #print randomModel()
-    g = TestCaseGenerator()
-    g.generateAndRun(20000)
+    #g = TestCaseGenerator()
+    #g.generateAndRun(20000)
     
     #t = TestCase(filename = "error_1.17721e+009.xml")

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

@@ -47 +47 @@
         self.assertAlmostEqual(self.model.run(0.001), 4723.32213339, 3)
         self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 4743.56, 2)
+        
+    def test_gaussian_zero(self):
+        from sans.models.dispersion_models import GaussianDispersion
+        disp = GaussianDispersion()
+        self.model.set_dispersion('radius', disp)
+        self.model.dispersion['radius']['width'] = 0.0
+        self.model.dispersion['radius']['npts'] = 100
+        self.model.setParam('scale', 1.0)
+        
+        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
+        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
         
     def test_array(self):
@@ -429 +440 @@
         self.assertTrue(math.fabs(val_1d-val_2d)/val_1d < 0.02)
         
+class TestDispModel(unittest.TestCase):
+    def setUp(self):
+        from sans.models.CylinderModel import CylinderModel
+        self.model = CylinderModel()
+        
+        
+    def test_disp_params(self):
+        
+        self.assertEqual(self.model.dispersion['radius']['width'], 0.0)
+        self.model.setParam('radius.width', 5.0)
+        self.assertEqual(self.model.dispersion['radius']['width'], 5.0)
+        self.assertEqual(self.model.getParam('radius.width'), 5.0)
+        self.assertEqual(self.model.dispersion['radius']['type'], 'gaussian')
         
   

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

@@ -66 +66 @@
         
     def testIO_add(self):
+        # version 0.5.0: No longer supported
+        return
         from sans.models.ModelFactory import ModelFactory
         from sans.models.ModelIO import ModelIO
@@ -79 +81 @@
         
     def testIO_add2(self):
+        # version 0.5.0: No longer supported
+        return
         from sans.models.ModelFactory import ModelFactory
         #from sans.models.ModelIO import ModelIO
@@ -109 +113 @@
         self.assertAlmostEqual(self.comp.run(0.2), 0.041761386790780453, 4)
         
-class TestAddition(unittest.TestCase):
-    """Unit tests for Model Factory"""
-    
-    def setUp(self):
-        from sans.models.ModelFactory import ModelFactory
-        self.comp1 = ModelFactory().getModel('CylinderModel')
-        self.comp2 = ModelFactory().getModel('CylinderModel')
-        self.comp3 = self.comp1+self.comp2
-        
-    def test1D(self):
-        """ Test 1D model of a cylinder """
-        self.assertAlmostEqual(self.comp3.run(0.2), 2*0.041761386790780453, 4)
-        
  
 class TestGaussian(unittest.TestCase):
@@ -230 +221 @@
         
     def testFunction(self):
+        # version 0.5.0: No longer supported
+        return
         from sans.models.Sin import Sin
         s = Sin()

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

@@ -3 +3 @@
     C++ model classes
 """
-
+print "New style models are still under development"
 import unittest, math, numpy
 
@@ -22 +22 @@
         return self.params['scale']*x
 
-from BaseModel import BaseModel
+from sans.models.BaseModel import BaseModel,ParameterProperty
 class NewTestModel(BaseModel):
     scale = ParameterProperty('scale')
@@ -57 +57 @@
     """
     def setUp(self):
-        from sans.models.NewCylinderModel import NewCylinderModel
-        self.model = NewCylinderModel()
+        from sans.models.NewCylinderModel import CylinderModel
+        self.model = CylinderModel()
         
         
     def test_setparam(self):
-        pass
+        self.model.setParam("length", 151.0)
+        self.assertEquals(self.model.getParam("length"), 151.0)
+        
+        
+        print self.model.parameters
+        
+        print self.model(0.001)
+        self.model.setParam("length", 250.0)
+        print self.model(0.001)