Changeset 4c29e4d in sasview

Timestamp:

May 6, 2016 12:43:26 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b523c0e

Parents:

6a698c0

Message:

remove compiler warnings from mac build

Files:

• setup.py (modified) (4 diffs)
• src/sas/sascalc/calculator/c_extensions/librefl.c (modified) (1 diff)
• src/sas/sascalc/calculator/c_extensions/sld2i.hh (modified) (1 diff)

setup.py

@@ -215 +215 @@
             os.path.join(gen_dir, "libfunc.c"),
             os.path.join(gen_dir, "librefl.c"),
-            os.path.join(gen_dir, "winFuncs.c"),
         ],
         include_dirs=[numpy_incl_path, gen_dir],
@@ -268 +267 @@
 # packages.append("sas.models")
 
-IGNORED_FILES = [".svn"]
-if not os.name=='nt':
-    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"])
-
 EXTENSIONS = [".c", ".cpp"]
 
@@ -281 +276 @@
         if os.path.isfile(os.path.join(dir_path, f)):
             _, ext = os.path.splitext(f)
-            if ext.lower() in EXTENSIONS and f not in IGNORED_FILES:
+            if ext.lower() in EXTENSIONS:
                 file_list.append(os.path.join(dir_path, f))
         elif os.path.isdir(os.path.join(dir_path, f)) and \
@@ -289 +284 @@
                 if os.path.isfile(os.path.join(sub_dir, new_f)):
                     _, ext = os.path.splitext(new_f)
-                    if ext.lower() in EXTENSIONS and\
-                         new_f not in IGNORED_FILES:
+                    if ext.lower() in EXTENSIONS:
                         file_list.append(os.path.join(sub_dir, new_f))
 

src/sas/sascalc/calculator/c_extensions/librefl.c

@@ -8 +8 @@
 #include <stdlib.h>
 #if defined(_MSC_VER)
-#include "winFuncs.h"
+#define NEED_ERF
 #endif
+
+
+
+#if defined(NEED_ERF)
+/* erf.c  - public domain implementation of error function erf(3m)
+
+reference - Haruhiko Okumura: C-gengo niyoru saishin algorithm jiten
+            (New Algorithm handbook in C language) (Gijyutsu hyouron
+            sha, Tokyo, 1991) p.227 [in Japanese]                 */
+
+
+#ifdef _WIN32
+# include <float.h>
+# if !defined __MINGW32__ || defined __NO_ISOCEXT
+#  ifndef isnan
+#   define isnan(x) _isnan(x)
+#  endif
+#  ifndef isinf
+#   define isinf(x) (!_finite(x) && !_isnan(x))
+#  endif
+#  ifndef finite
+#   define finite(x) _finite(x)
+#  endif
+# endif
+#endif
+
+static double q_gamma(double, double, double);
+
+/* Incomplete gamma function
+   1 / Gamma(a) * Int_0^x exp(-t) t^(a-1) dt  */
+static double p_gamma(double a, double x, double loggamma_a)
+{
+    int k;
+    double result, term, previous;
+
+    if (x >= 1 + a) return 1 - q_gamma(a, x, loggamma_a);
+    if (x == 0)     return 0;
+    result = term = exp(a * log(x) - x - loggamma_a) / a;
+    for (k = 1; k < 1000; k++) {
+        term *= x / (a + k);
+        previous = result;  result += term;
+        if (result == previous) return result;
+    }
+    fprintf(stderr, "erf.c:%d:p_gamma() could not converge.", __LINE__);
+    return result;
+}
+
+/* Incomplete gamma function
+   1 / Gamma(a) * Int_x^inf exp(-t) t^(a-1) dt  */
+static double q_gamma(double a, double x, double loggamma_a)
+{
+    int k;
+    double result, w, temp, previous;
+    double la = 1, lb = 1 + x - a;  /* Laguerre polynomial */
+
+    if (x < 1 + a) return 1 - p_gamma(a, x, loggamma_a);
+    w = exp(a * log(x) - x - loggamma_a);
+    result = w / lb;
+    for (k = 2; k < 1000; k++) {
+        temp = ((k - 1 - a) * (lb - la) + (k + x) * lb) / k;
+        la = lb;  lb = temp;
+        w *= (k - 1 - a) / k;
+        temp = w / (la * lb);
+        previous = result;  result += temp;
+        if (result == previous) return result;
+    }
+    fprintf(stderr, "erf.c:%d:q_gamma() could not converge.", __LINE__);
+    return result;
+}
+
+#define LOG_PI_OVER_2 0.572364942924700087071713675675 /* log_e(PI)/2 */
+
+double erf(double x)
+{
+    if (!finite(x)) {
+        if (isnan(x)) return x;      /* erf(NaN)   = NaN   */
+        return (x>0 ? 1.0 : -1.0);   /* erf(+-inf) = +-1.0 */
+    }
+    if (x >= 0) return   p_gamma(0.5, x * x, LOG_PI_OVER_2);
+    else        return - p_gamma(0.5, x * x, LOG_PI_OVER_2);
+}
+
+double erfc(double x)
+{
+    if (!finite(x)) {
+        if (isnan(x)) return x;      /* erfc(NaN)   = NaN      */
+        return (x>0 ? 0.0 : 2.0);    /* erfc(+-inf) = 0.0, 2.0 */
+    }
+    if (x >= 0) return  q_gamma(0.5, x * x, LOG_PI_OVER_2);
+    else        return  1 + p_gamma(0.5, x * x, LOG_PI_OVER_2);
+}
+#endif // NEED_ERF
 
 complex cassign(real, imag)

src/sas/sascalc/calculator/c_extensions/sld2i.hh

@@ -39 +39 @@
                         double s_theta);
         // compute function
-        virtual void genicomXY(int npoints, double* qx, double* qy, double *I_out);
-        virtual void genicom(int npoints, double* q, double *I_out);
+        void genicomXY(int npoints, double* qx, double* qy, double *I_out);
+        void genicom(int npoints, double* q, double *I_out);
 };