Changeset fcd5e83 in sasmodels

Timestamp:

Feb 8, 2016 7:49:08 AM (8 years ago)

Author:

wojciech

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:

43cb3b8

Parents:

a9d4d1f

Message:

Added unit tests to line model

File:

• sasmodels/models/line.py (modified) (4 diffs)

sasmodels/models/line.py

@@ -20 +20 @@
 
 """
-
-from numpy import vectorize
 from numpy import inf
 
@@ -40 +38 @@
               ["slope",     "Ang*cm^-1",    1.0, [-inf, inf], "", "slope in linear model"],
               ]
+# pylint: enable=bad-whitespace, line-too-long
 
 def Iq(q, intercept, slope):
@@ -48 +47 @@
     :return:            Calculated Intensity
     """
-
     inten = intercept + slope*q
     return inten
@@ -63 +61 @@
     #TODO: Instrcution tels 2D has different deffinition than oher models
     #return Iq(sqrt(qx ** 2 + qy ** 2), *args)
-    return  Iq(qx,*args)*Iq(qy,*args)
+    return  Iq(qx, *args)*Iq(qy, *args)
 
 Iqxy.vectorized = True # Iqxy accepts an array of qx, qy values
 
-demo = dict(scale=1, background=0.1,
-            intercept=1.0, slope=1.0)
+demo = dict(intercept=1.0, slope=1.0)
 
 oldname = "LineModel"
-oldpars = dict(intercept='A', slope='B', scale=None)
+oldpars = dict(intercept='A', slope='B', scale=None, background=None)
+
+tests = [
+    # Accuracy tests based on content in test/utest_other_models.py
+    [{'intercept':   1.0,
+      'slope': 1.0,
+     }, 0.4, 0.4],
+
+    [{'intercept':   1.0,
+      'slope': 1.0,
+     }, 1.3, 1.3],
+
+    [{'intercept':   1.0,
+      'slope': 1.0,
+     },0.5, 0.5],
+
+    [{'intercept':   1.0,
+      'slope': 1.0,
+     }, 1.57, 1.57],
+]