Changeset 82923a6 in sasmodels

Timestamp:

Apr 18, 2016 8:31:11 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

3a45c2c, f36c1b7

Parents:

7835d462

Message:

allow tests against inf and nan

Location:

sasmodels

Files:

• model_test.py (modified) (1 diff)
• models/porod.py (modified) (3 diffs)

sasmodels/model_test.py

@@ -207 +207 @@
                     self.assertTrue(np.isfinite(actual_yi),
                                     'invalid f(%s): %s' % (xi, actual_yi))
+                elif np.isnan(yi):
+                    self.assertTrue(np.isnan(actual_yi),
+                                    'f(%s): expected:%s; actual:%s'
+                                    % (xi, yi, actual_yi))
                 else:
-                    self.assertTrue(is_near(yi, actual_yi, 5),
+                    # is_near does not work for infinite values, so also test
+                    # for exact values.  Note that this will not
+                    self.assertTrue(yi==actual_yi or is_near(yi, actual_yi, 5),
                                     'f(%s); expected:%s; actual:%s'
                                     % (xi, yi, actual_yi))

sasmodels/models/porod.py

@@ -26 +26 @@
 """
 
-from numpy import sqrt, power
+from numpy import sqrt, power, inf, errstate
 
 name = "porod"
@@ -42 +42 @@
     @param q: Input q-value
     """
-    return 1.0/power(q, 4)
+    with errstate(divide='ignore'):
+        return power(q, -4)
 
 Iq.vectorized = True  # Iq accepts an array of q values
@@ -58 +59 @@
 demo = dict(scale=1.5, background=0.5)
 
-tests = [[{'scale': 0.00001, 'background':0.01}, 0.04, 3.916250]]
+tests = [
+    [{'scale': 0.00001, 'background':0.01}, 0.04, 3.916250],
+    [{}, 0.0, inf],
+]