Changeset 0abf7bf in sasview for sansmodels/test

Timestamp:

Nov 23, 2011 3:16:37 PM (13 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:

26da93f

Parents:

953fe92

Message:

Re #5 Get rid of pyre models, odb creation, and modelfactory, all of which haven't been used since 2007.

Location:

sansmodels/test

Files:

• SmearList.py (modified) (4 diffs)
• testcase_generator.py (deleted)
• utest_disperser.py (modified) (3 diffs)
• utest_models.py (modified) (1 diff)
• validate_1D_model.py (modified) (2 diffs)

sansmodels/test/SmearList.py

@@ -1 +1 @@
 
-from sans.models.ModelFactory import ModelFactory
 from sans.models.BaseComponent import BaseComponent
 import math
@@ -15 +14 @@
         
         ## Model to smear
-        #self.model = factory.getModel(model_name)
         self.model = model
         ## Standard deviation of the smearing
@@ -53 +51 @@
             
             # Gaussian function used to weigh points
-            #gaussian = ModelFactory().getModel("Gaussian")
             gaussian = Gaussian()
             gaussian.setParam('sigma', self.sigmas[id])
@@ -162 +159 @@
         
         return value
-        
-# main
-if __name__ == '__main__':
-    import math
-    if True:
-        cyl = ModelFactory().getModel("CylinderModel")
-        cyl.setParam('length', 2000.0)
-        cyl.setParam('cyl_phi', .45)
-        cyl.setParam('cyl_theta', 2.)
-        #app = Smear(cyl,['cyl_theta', 'cyl_phi'], [.01, .01])
-        #app = Smear(cyl,['cyl_theta', 'cyl_phi'], [2.0, 2.0])
-        #app = Smear(cyl,['cyl_theta'], [2.5])
-        app = Smear(cyl, ['cyl_phi', 'cyl_theta'], [math.pi, math.pi])
-        #app = Smear(cyl,['scale', 'scale'],[.5,1.0])
-        val_no = cyl.run([.001, 1.0])
-        print "Cylinder (no smear) f(.1):", val_no
-        val_sm =  app.run([.001, 1.0])
-        print "Cylinder (smear)    f(.1):", val_sm, app.error, app.error/val_sm
-        print "Cylinder (1D)    f(.1):", cyl.run(.001), cyl.run(.001)/val_sm
-      
-      
-    print "--------------"
-    sinsin = ModelFactory().getModel("SinSin")
-    sinsin.setParam('a', -1.7)
-    sinsin.setParam('b', 5.45)
-    #app = Smear(sinsin, ['A'], [3.1])
-    #app = Smear(sinsin, ['A', 'b'], [math.pi/2.0, .0])
-    app = Smear(sinsin, ['A'], [math.pi/2.0])
-    #app = Smear(cyl,['scale', 'scale'],[.5,1.0])
-    val_no = sinsin.run(1.0)
-    print "SinSin (no smear) :", val_no
-    val_sm =  app.run(1.0)
-    print "SinSin (smear)    : %g +- %g" % (val_sm, app.error)
-      

sansmodels/test/utest_disperser.py

@@ -15 +15 @@
 
 from sans.models.sans_extension.c_models import Disperser
-from sans.models.ModelFactory import ModelFactory
+from sans.models.CylinderModel import CylinderModel
 from sans.models.DisperseModel import DisperseModel
       
@@ -22 +22 @@
     
     def setUp(self):
-        self.model = ModelFactory().getModel("CylinderModel")
+        self.model = CylinderModel()
         self.model.setParam("cyl_theta", 1.57)
         self.model.setParam("cyl_phi", 0.1)
@@ -84 +84 @@
     
     def setUp(self):
-        self.model = ModelFactory().getModel("CylinderModel")
+        self.model = CylinderModel()
         self.model.setParam("cyl_theta", 1.57)
         self.model.setParam("cyl_phi", 0.1)

sansmodels/test/utest_models.py

@@ -63 +63 @@
         self.comp.setParam('cyl_phi', 1*180/math.pi)
         self.assertAlmostEqual(self.comp.run([0.2, 2.5]), 
-                               0.038176446608393366, 4)
-       
-    def testIO(self):
-        from sans.models.ModelFactory import ModelFactory
-        from sans.models.ModelIO import ModelIO
-        factory = ModelFactory()
-        io = ModelIO(factory)
-        io.save(self.comp,"myModel.xml")
-        value = self.comp.run(1)
-        loaded = io.load("myModel.xml")
-        self.assertEqual(value, loaded.run(1))
-        
-    def testIO_add(self):
-        # version 0.5.0: No longer supported
-        return
-        from sans.models.ModelFactory import ModelFactory
-        from sans.models.ModelIO import ModelIO
-        factory = ModelFactory()
-        io = ModelIO(factory)
-        sph = factory.getModel("SphereModel")
-        cyl = factory.getModel("CylinderModel")
-        combo = sph - cyl
-        io.save(combo,"myModel.xml")
-        value = combo.run(1)
-        loaded = io.load("myModel.xml")
-        self.assertEqual(value, loaded.run(1))
-        
-    def testIO_add2(self):
-        # version 0.5.0: No longer supported
-        return
-        from sans.models.ModelFactory import ModelFactory
-        #from sans.models.ModelIO import ModelIO
-        factory = ModelFactory()
-        #io = ModelIO(factory)
-        sph = factory.getModel("SphereModel")
-        cyl = factory.getModel("CylinderModel")
-        sph2 = factory.getModel("SphereModel")
-        combo1 = cyl - sph
-        combo = combo1 / sph2
-        #combo1 = sph
-        #io.save(combo,"myModel.xml")
-        # Just check that we have some output
-        self.assertTrue(math.fabs(combo.run(1))>0)
-        #loaded = io.load("myModel.xml")
-        #self.assertEqual(value, loaded.run(1))
-        
-        
-      
-       
-class TestFactory(unittest.TestCase):
-    """Unit tests for Model Factory"""
-    
-    def setUp(self):
-        from sans.models.ModelFactory import ModelFactory
-        self.comp = ModelFactory().getModel('CylinderModel')
-        
-    def test1D(self):
-        """ Test 1D model of a cylinder """ 
-        self.assertAlmostEqual(self.comp.run(0.2), 0.041761386790780453, 4)
-        
+                               0.038176446608393366, 4) 
  
 class TestGaussian(unittest.TestCase):

sansmodels/test/validate_1D_model.py

@@ -25 +25 @@
             @param filename: name of the test data set
         """
-        from sans.models.ModelFactory import ModelFactory
+        from sans.models.CylinderModel import CylinderModel
         
         # Read the data file
@@ -46 +46 @@
                     print "Found class", toks[1]
                     classname = toks[1].lstrip().rstrip()
-                    model_object = ModelFactory().getModel(classname)
+                    exec "from sans.models.%s import %s" % (classname, classname)
+                    exec "model_object = %s()" % classname
                 
                     # Output file for plotting