Changeset 279e371 in sasview for sansmodels/test

Timestamp:

Apr 18, 2012 1:26:13 PM (12 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:

499fe7a

Parents:

3ee4d96

Message:

Fixing code style problems

File:

• sansmodels/test/utest_other_models.py (modified) (1 diff)

sansmodels/test/utest_other_models.py

@@ -1447 +1447 @@
         self.comp.setParam('B', 0.0)
         self.assertRaises(ZeroDivisionError, self.comp.run, 10)
-        #self.assert_(numpy.isfinite(self.comp.run(0.0)))  
-        
-       
-class TestFractalAbsModel(unittest.TestCase):
-    """ Unit tests for FractalAbsModel"""
-    
-    def setUp(self):
-        from sans.models.FractalAbsModel import FractalAbsModel
-        self.comp = FractalAbsModel()
-        self.comp.setParam('scale', 0.05)
-        self.comp.setParam('radius', 5.0)
-        self.comp.setParam('fractal_dim', 2.0)
-        self.comp.setParam('cor_length',100.0)
-        self.comp.setParam('sldBlock', 2.0e-6)
-        self.comp.setParam('sldSolv', 6.35e-6)
-        self.comp.setParam('background',0.0)
-        
-        self.x = numpy.array([0.4, 1.3])
-        self.y = numpy.array([0.5, 1.57])
-        
-        self.x_array = self.comp.evalDistribution(self.x)
-        self.y_array = self.comp.evalDistribution(self.y)
-        qx_prime = numpy.reshape(self.x, [1,len(self.x)])
-        qy_prime = numpy.reshape(self.y, [len(self.y),1])
-        self.xy_matrix = self.comp.evalDistribution([self.x, self.y])
-        
-    def test1D(self):
-        """ Test 1D model for a Fractal Abs Model"""
-        self.assertAlmostEqual(self.comp.run(0.001), 39.2881, 3)
-        
-    def test1D_2(self):
-        """ Test 2D model for a Fractal Abs Model"""
-        self.assertAlmostEqual(self.comp.run([0.001, 1.3]), 39.2881, 3)
-        
-    def testEval_1D(self):
-        """ Test 1D model for a Fractal Abs Model with evalDistribution"""
-        self.assertEquals(self.comp.run(0.4),self.x_array[0])
-        self.assertEquals(self.comp.run(1.3),self.x_array[1])
-        
-    def testEval_2D(self):
-        """ Test 2D model for a Fractal Abs Model 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)
-
-    # No more singular point
-    #def testCriticalPoint(self):
-    #    """ Test Fractal Abs at the critical point"""
-    #    self.assert_(numpy.isfinite(self.comp.run(0.0)))    
+        #self.assert_(numpy.isfinite(self.comp.run(0.0)))       
    
 class TestFractalModel(unittest.TestCase):