Changes in / [4605bf10:a7c2cfe] in sasmodels

Location:

sasmodels

Files:

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

sasmodels/model_test.py

@@ -259 +259 @@
                     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/__init__.py

@@ +1 @@
+"""
+    1D Modeling for SAS
+"""
+#from sas.models import *
+
+import os
+from distutils.filelist import findall
+
+__version__ = "2.1.0"
+
+def get_data_path(media):
+    """
+    """
+    # Check for data path in the package
+    path = os.path.join(os.path.dirname(__file__), media)
+    if os.path.isdir(path):
+        return path
+
+    # Check for data path next to exe/zip file.
+    # If we are inside a py2exe zip file, we need to go up
+    # to get to the directory containing 
+    # the media for this module
+    path = os.path.dirname(__file__)
+    #Look for maximum n_dir up of the current dir to find media
+    n_dir = 12
+    for i in range(n_dir):
+        path, _ = os.path.split(path)
+        media_path = os.path.join(path, media)
+        if os.path.isdir(media_path):
+            module_media_path = os.path.join(media_path, 'models_media')
+            if os.path.isdir(module_media_path):
+                return module_media_path
+            return media_path
+   
+    raise RuntimeError('Could not find models media files')
+
+def data_files():
+    """
+    Return the data files associated with media.
+    
+    The format is a list of (directory, [files...]) pairs which can be
+    used directly in setup(...,data_files=...) for setup.py.
+
+    """
+    data_files = []
+    path_img = get_data_path(media=os.path.join("sasmodels","sasmodels","models","img"))
+    #path_img = get_data_path(media="img")
+    im_list = findall(path_img)
+    #for f in findall(path):
+    #    if os.path.isfile(f) and f not in im_list:
+    #        data_files.append(('media/models_media', [f]))
+    
+    for f in im_list:
+        data_files.append(('media/models_media/img', [f]))
+    return data_files
+

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],
+]