Changeset 749a7d4 in sasmodels

Timestamp:

Feb 20, 2017 5:29:09 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c

Parents:

9ed53e7

git-author:

Paul Kienzle <pkienzle@…> (02/20/17 17:28:40)

git-committer:

Paul Kienzle <pkienzle@…> (02/20/17 17:29:09)

Message:

test that model calculation returns NaN if point is out of range

File:

• sasmodels/sasview_model.py (modified) (5 diffs)

sasmodels/sasview_model.py

@@ -734 +734 @@
             return [self.params[par.name]], [1.0]
 
-def test_model():
+def test_cylinder():
     # type: () -> float
     """
-    Test that a sasview model (cylinder) can be run.
+    Test that the cylinder model runs, returning the value at [0.1,0.1].
     """
     Cylinder = _make_standard_model('cylinder')
@@ -746 +746 @@
     # type: () -> float
     """
-    Test that a sasview model (cylinder) can be run.
+    Test that 2-D hardsphere model runs and doesn't produce NaN.
     """
     Model = _make_standard_model('hardsphere')
@@ -757 +757 @@
     # type: () -> float
     """
-    Test that a sasview model (cylinder) can be run.
+    Test that the 2-D RPA model runs
     """
     RPA = _make_standard_model('rpa')
@@ -763 +763 @@
     return rpa.evalDistribution([0.1, 0.1])
 
+def test_empty_distribution():
+    # type: () -> None
+    """
+    Make sure that sasmodels returns NaN when there are no polydispersity points
+    """
+    Cylinder = _make_standard_model('cylinder')
+    cylinder = Cylinder()
+    cylinder.setParam('radius', -1.0)
+    cylinder.setParam('background', 0.)
+    Iq = cylinder.evalDistribution(np.asarray([0.1]))
+    assert np.isnan(Iq[0]), "empty distribution fails"
 
 def test_model_list():
     # type: () -> None
     """
-    Make sure that all models build as sasview models.
+    Make sure that all models build as sasview models
     """
     from .exception import annotate_exception
@@ -794 +805 @@
 
 if __name__ == "__main__":
-    print("cylinder(0.1,0.1)=%g"%test_model())
+    print("cylinder(0.1,0.1)=%g"%test_cylinder())
+    #test_empty_distribution()