Changeset 1e7de38 in sasview for sansmodels/src

Timestamp:

Oct 4, 2010 12:53:10 PM (14 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:

9ec4406

Parents:

d267aed

Message:

added time test

File:

• sansmodels/src/sans/models/test/utest_model_sphereexpshell.py (modified) (4 diffs)

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

@@ -15 +15 @@
         from sans.models.CoreMultiShellModel import CoreMultiShellModel
         from sans.models.VesicleModel import VesicleModel 
-
-        self.model = SphereExpShellModel(n_shells=1)
-        self.model2 = SphereExpShellModel(n_shells=1).model
-        self.model3 = CoreMultiShellModel(n_shells=1)
+        
+        # intit models and the multifactor
+        self.model = SphereExpShellModel(1)
+        self.model2 = SphereExpShellModel(1).model
+        self.model3 = CoreMultiShellModel(1)
         self.model4 = VesicleModel()
+        self.model5 = SphereExpShellModel(9)
         
     def test_compare_Exp0_flat(self):
@@ -53 +55 @@
     def test_compare_Exp0_flat_vesicle(self):
         """
-        Check if Exp function with A_shell=0 gives the same value as Flat function of vesicle model when sld_solv=sld_core
+        Check if Exp function with A_shell=0 gives the same value as Flat 
+        function of vesicle model when sld_solv=sld_core
         """
-        print "\n*****Note: All tests (test_compare_Exp0_flat and test_compare_Expsmall_line) were passes since Sept. 18, 2010..."
+        print "\n*****Note: All tests (test_compare_Exp0_flat and \
+            test_compare_Expsmall_line) were passes since Sept. 18, 2010..."
         # Exp: func_shell = 2, Line: func_shell =1 , Flat: func_shell = 0.
         # A_shell = The coefficient of the exponential function: exp(A_shell*(r-ro)/thick_shell)
@@ -90 +94 @@
     def test_compare_Expsmall_line(self):
         """
-        Check if Exp function with A_shell-->0 gives the same value as linear function
+        Check if Exp function with A_shell-->0 gives the same value 
+        as a linear function
         """
         # exp function crosses over to line func as A_shell-->0
@@ -101 +106 @@
         self.assertAlmostEqual(self.model.run(0.1),self.model2.run(0.1),4)
         
+    def test_compare_time_linear_flat_functions(self):
+        """
+        Compare the calculation time between func=1(linear) , and 2 (step).
+        """
+        from time import time
+        # using linear func
+        self.model5.model.setParam("func_shell1", 1)
+        #input
+        input = [0.01,0.01]
+        st = time()
+        for iter in range(0,100000):
+            self.model5.model.run(0.01)
+        time_linear = time()-st
+        
+        # using flat function
+        self.model5.model.setParam("func_shell1", 0)
+        st = time()
+        for iter in range(0,100000):
+            self.model5.model.run(0.01)
+        time_flat = time()-st
+        
+        print "time (linear) = %s, \n time (flat) = %s"% (time_linear,time_flat)
+        
+        #Compare time of the calculation: time_linear takes a bit longer
+        # but they are not much different  
+        self.assertAlmostEqual(time_linear,time_flat,0)