Changeset 1e40ed1 in sasview for sansmodels

Timestamp:

Aug 23, 2012 10:22:16 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

10b3e1e

Parents:

fe112d1a

Message:

Small problem with the maths in starpolymer

Location:

sansmodels

Files:

• src/c_models/starpolymer.cpp (modified) (1 diff)
• test/utest_models.py (modified) (3 diffs)
• test/utest_other_models.py (modified) (1 diff)

sansmodels/src/c_models/starpolymer.cpp

@@ -27 +27 @@
   double d_background = background();
 
-  double u = d_R2 * pow(q,2);
-  double v = pow(u,2.0) * d_arms / (3.0 * d_arms - 2.0);
+  double u_2 = d_R2 * pow(q,2);
+  double v = u_2 * d_arms / (3.0 * d_arms - 2.0);
 
   double term1 = v - 1.0 + exp(-v);

sansmodels/test/utest_models.py

@@ -107 +107 @@
         self.star.setParam('R2', 100.0)
         self.star.setParam('background', 1.0)
-        self.assertAlmostEqual(self.star.run(0.01), 3.9998999827681025)
+        self.assertAlmostEqual(self.star.run(0.01), 3.9900214150405686)
 
     def test2D(self):
@@ -117 +117 @@
         self.star.setParam('R2', 100.0)
         self.star.setParam('background', 1.0)
-        self.assertAlmostEqual(self.star.runXY([x, y]), 3.9998999827681025)
+        self.assertAlmostEqual(self.star.runXY([x, y]), 3.9900214150405686)
 
     def test2Dphi(self):
@@ -125 +125 @@
         self.star.setParam('background', 1.0)
         
-        self.assertAlmostEqual(self.star.run([0.01, math.pi/4.0]), 3.9998999827681025)
+        self.assertAlmostEqual(self.star.run([0.01, math.pi/4.0]), 3.9900214150405686)
 
 

sansmodels/test/utest_other_models.py

@@ -1234 +1234 @@
         self.assert_(numpy.isfinite(self.comp.run(0.0)))           
 
-class TestStarPolymer(unittest.TestCase):
-    """ Unit tests for StarPolymer"""
-    
-    def setUp(self):
-        from sans.models.StarPolymer import StarPolymer
-        self.comp = StarPolymer()
-        self.comp.setParam('arms',3.0)
-        self.comp.setParam('scale',5.0)
-        self.comp.setParam('background',1.0)
-        self.comp.setParam('R2',100.0)
-        
-        
-    def test1D(self):
-        """ Test 1D model for a StarPolymer"""
-        # our variables
-        q = 0.001
-        rg = 100.0
-        f = 3.0
-        bkg = 1.0
-        scale = 5.0
-
-        # equation set up
-        u = rg * q * q
-        v = u * u * f / (3*f - 2)
-        p = 2 / (f * v * v)
-        temp = v - 1 + math.exp(-v)
-        temp += (f - 1)/2 * math.pow(1 - math.exp(-v), 2)
-        p *= (temp * scale)
-        p += bkg
-        
-        self.assertAlmostEquals(self.comp.run(q), p, 5)
-        
-    def test1D_2(self):
-        """ Test 2D model for a StarPolymer"""
-        qx = 0.001
-        qy = 1.3
-        q = math.sqrt(qx*qx + qy*qy)
-        rg = 100.0
-        f = 3.0
-        bkg = 1.0
-        scale = 5.0
-
-        # equation set up
-        u = rg * q * q
-        v = u * u * f / (3*f - 2)
-        p = 2 / (f * v * v)
-        temp = v - 1 + math.exp(-v)
-        temp += (f - 1)/2 * math.pow(1 - math.exp(-v), 2)
-        p *= (temp * scale)
-        p += bkg
-
-        self.assertAlmostEqual(self.comp.runXY([0.001, 1.3]), p, 5)