Changeset 07a6700 in sasmodels

Timestamp:

Jan 27, 2016 4:01:36 AM (9 years ago)

Author:

piotr

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

87edabf

Parents:

29da213

Message:

More unit tests for converted models.

Location:

sasmodels/models

Files:

• be_polyelectrolyte.py (modified) (1 diff)
• gauss_lorentz_gel.py (modified) (1 diff)
• mass_fractal.py (modified) (1 diff)
• mass_surface_fractal.py (modified) (3 diffs)
• polymer_excl_volume.py (modified) (1 diff)
• surface_fractal.py (modified) (1 diff)
• two_lorentzian.py (modified) (1 diff)

sasmodels/models/be_polyelectrolyte.py

@@ -133 +133 @@
                polymer_concentration='c')
 
-tests = [[{'contrast_factor':       10.0,
+tests = [
+         # Accuracy tests based on content in test/utest_other_models.py
+         [{'contrast_factor':       10.0,
+           'bjerrum_length':         7.1,
+           'virial_param':          12.0,
+           'monomer_length':        10.0,
+           'salt_concentration':     0.0,
+           'ionization_degree':      0.05,
+           'polymer_concentration':  0.7,
+           'background':             0.001,
+           }, 0.001, 0.0948379],
+
+         # Additional tests with larger range of parameters
+         [{'contrast_factor':       10.0,
            'bjerrum_length':       100.0,
            'virial_param':           3.0,

sasmodels/models/gauss_lorentz_gel.py

@@ -110 +110 @@
                dynamic_cor_length='dyn_colength')
 
-tests = [[{'gauss_scale_factor':  10.0,
+tests = [
+         # Accuracy tests based on content in test/utest_extra_models.py
+         [{'gauss_scale_factor':  100.0,
+           'static_cor_length':   100.0,
+           'lorentz_scale_factor': 50.0,
+           'dynamic_cor_length':   20.0,
+           }, 0.001, 149.481],
+
+         [{'gauss_scale_factor':  100.0,
+           'static_cor_length':   100.0,
+           'lorentz_scale_factor': 50.0,
+           'dynamic_cor_length':   20.0,
+           }, 0.105363, 9.1903],
+
+         [{'gauss_scale_factor':  100.0,
+           'static_cor_length':   100.0,
+           'lorentz_scale_factor': 50.0,
+           'dynamic_cor_length':   20.0,
+           }, 0.441623, 0.632811],
+
+         # Additional tests with larger range of parameters
+         [{'gauss_scale_factor':  10.0,
            'static_cor_length':  100.0,
            'lorentz_scale_factor': 3.0,

sasmodels/models/mass_fractal.py

@@ -98 +98 @@
                cutoff_length='co_length')
 
-tests = [[{'radius':        2.0,
+tests = [
+         # Accuracy tests based on content in test/utest_other_models.py
+         [{'radius':       10.0,
+           'mass_dim':      1.9,
+           'cutoff_length': 2.3,
+           }, 0.05, 279.59322],
+
+         # Additional tests with larger range of parameters
+         [{'radius':        2.0,
            'mass_dim':      3.3,
            'cutoff_length': 1.0,

sasmodels/models/mass_surface_fractal.py

@@ -106 +106 @@
                primary_rg='primary_rg')
 
-tests = [[{'radius':        2.0,
-           'mass_dim':      3.3,
+tests = [
+         # Accuracy tests based on content in test/utest_other_models.py
+         [{'mass_dim':      1.8,
+           'surface_dim':   2.3,
+           'cluster_rg':   86.7,
+           'primary_rg': 4000.0,
+           }, 0.05, 1.77537e-05],
+
+         # Additional tests with larger range of parameters
+         [{'mass_dim':      3.3,
            'surface_dim':   1.0,
            'cluster_rg':   90.0,
@@ -113 +121 @@
            }, 0.001, 0.18462699016],
 
-         [{'radius':        1.0,
-           'mass_dim':      1.3,
+         [{'mass_dim':      1.3,
            'surface_dim':   1.0,
            'cluster_rg':   90.0,
@@ -121 +128 @@
            }, 0.001, 1.16539753641],
 
-         [{'radius':        1.0,
-           'mass_dim':      2.3,
+         [{'mass_dim':      2.3,
            'surface_dim':   1.0,
            'cluster_rg':   90.0,

sasmodels/models/polymer_excl_volume.py

@@ -157 +157 @@
                porod_exp='m')
 
-tests = [[{'rg': 10, 'porod_exp': 4.0}, 0.1, 0.723436675809],
+tests = [
+         # Accuracy tests based on content in test/polyexclvol_default_igor.txt
+         [{'rg': 60, 'porod_exp': 3.0}, 0.001, 0.998801],
+         [{'rg': 60, 'porod_exp': 3.0}, 0.105363, 0.0162751],
+         [{'rg': 60, 'porod_exp': 3.0}, 0.665075, 6.56261e-05],
 
+         # Additional tests with larger range of parameters
+         [{'rg': 10, 'porod_exp': 4.0}, 0.1, 0.723436675809],
          [{'rg': 2.2, 'porod_exp': 22.0, 'background': 100.0}, 5.0, 100.0],
-
          [{'rg': 1.1, 'porod_exp': 1, 'background': 10.0, 'scale': 1.25},
          20000., 10.0000712097]

sasmodels/models/surface_fractal.py

@@ -100 +100 @@
                cutoff_length='co_length')
 
-tests = [[{'radius': 1.0, 'surface_dim': 1.0, 'cutoff_length': 10.0,
+tests = [
+         # Accuracy tests based on content in test/utest_other_models.py
+         [{'radius': 10.0, 'surface_dim': 2.0, 'cutoff_length': 500.0,
+           }, 0.05, 301428.65916],
+
+         # Additional tests with larger range of parameters
+         [{'radius': 1.0, 'surface_dim': 1.0, 'cutoff_length': 10.0,
            }, 0.332070182643, 1125.00321004],
 

sasmodels/models/two_lorentzian.py

@@ -117 +117 @@
                lorentz_exp_1='exponent_1',  lorentz_exp_2='exponent_2')
 
-tests = [[{'lorentz_scale_1':   10.0,
+tests = [
+         # Accuracy tests based on content in test/utest_extra_models.py
+         [{'lorentz_scale_1':   10.0,
+           'lorentz_length_1': 100.0,
+           'lorentz_exp_1':      3.0,
+           'lorentz_scale_2':    1.0,
+           'lorentz_length_2':  10.0,
+           'lorentz_exp_2':      2.0,
+           'background':         0.1,
+           }, 0.001, 11.08991],
+
+         [{'lorentz_scale_1':   10.0,
+           'lorentz_length_1': 100.0,
+           'lorentz_exp_1':      3.0,
+           'lorentz_scale_2':    1.0,
+           'lorentz_length_2':  10.0,
+           'lorentz_exp_2':      2.0,
+           'background':         0.1,
+           }, 0.150141, 0.410245],
+
+         [{'lorentz_scale_1':   10.0,
+           'lorentz_length_1': 100.0,
+           'lorentz_exp_1':      3.0,
+           'lorentz_scale_2':    1.0,
+           'lorentz_length_2':  10.0,
+           'lorentz_exp_2':      2.0,
+           'background':         0.1,
+           }, 0.442528, 0.148699],
+
+         # Additional tests with larger range of parameters
+         [{'lorentz_scale_1':   10.0,
            'lorentz_length_1': 100.0,
            'lorentz_exp_1':      3.0,