Changeset c8902ac in sasmodels

Timestamp:

Dec 6, 2016 1:21:08 PM (7 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:

447e9aa

Parents:

1e13e35

Message:

rename j0,j1,jn to cephes_jx to avoid conflict with j0/j1/jn in math.h on some systems

Location:

sasmodels/models/lib

Files:

• sas_J0.c (modified) (5 diffs)
• sas_J1.c (modified) (5 diffs)
• sas_JN.c (modified) (7 diffs)

sasmodels/models/lib/sas_J0.c

@@ -55 +55 @@
 #if FLOAT_SIZE>4
 //Cephes double precission
-double j0(double x);
+double cephes_j0(double x);
 
  constant double PPJ0[8] = {
@@ -147 +147 @@
   };
 
-double j0(double x)
+double cephes_j0(double x)
 {
     double w, z, p, q, xn;
@@ -186 +186 @@
 #else
 //Cephes single precission
-float j0f(float x);
+float cephes_j0f(float x);
 
  constant float MOJ0[8] = {
@@ -221 +221 @@
  };
 
-float j0f(float x)
+float cephes_j0f(float x)
 {
     float xx, w, z, p, q, xn;
@@ -257 +257 @@
 
 #if FLOAT_SIZE>4
-#define sas_J0 j0
+#define sas_J0 cephes_j0
 #else
-#define sas_J0 j0f
+#define sas_J0 cephes_j0f
 #endif

sasmodels/models/lib/sas_J1.c

@@ -42 +42 @@
 #if FLOAT_SIZE>4
 //Cephes double pression function
-double j1(double x);
+double cephes_j1(double x);
 
 constant double RPJ1[8] = {
@@ -106 +106 @@
     0.0 };
 
-double j1(double x)
+double cephes_j1(double x)
 {
 
@@ -144 +144 @@
 #else
 //Single precission version of cephes
-float j1f(float x);
+float cephes_j1f(float x);
 
 constant float JPJ1[8] = {
@@ -179 +179 @@
     };
 
-float j1f(float x)
+float cephes_j1f(float x)
 {
 
@@ -211 +211 @@
 
 #if FLOAT_SIZE>4
-#define sas_J1 j1
+#define sas_J1 cephes_j1
 #else
-#define sas_J1 j1f
+#define sas_J1 cephes_j1f
 #endif
 

sasmodels/models/lib/sas_JN.c

@@ -50 +50 @@
 #if FLOAT_SIZE > 4
 
-double jn( int n, double x );
-double jn( int n, double x ) {
+double cephes_jn( int n, double x );
+double cephes_jn( int n, double x ) {
 
     // PAK: seems to be machine epsilon/2
@@ -75 +75 @@
 
     if( n == 0 )
-        return( sign * j0(x) );
+        return( sign * cephes_j0(x) );
     if( n == 1 )
-        return( sign * j1(x) );
+        return( sign * cephes_j1(x) );
     if( n == 2 )
-        return( sign * (2.0 * j1(x) / x  -  j0(x)) );
+        return( sign * (2.0 * cephes_j1(x) / x  -  cephes_j0(x)) );
 
     if( x < MACHEP )
@@ -112 +112 @@
 
     if( fabs(pk) > fabs(pkm1) )
-        ans = j1(x)/pk;
+        ans = cephes_j1(x)/pk;
     else
-        ans = j0(x)/pkm1;
+        ans = cephes_j0(x)/pkm1;
 
     return( sign * ans );
@@ -121 +121 @@
 #else
 
-float jnf(int n, float x);
-float jnf(int n, float x)
+float cephes_jnf(int n, float x);
+float cephes_jnf(int n, float x)
 {
     // PAK: seems to be machine epsilon/2
@@ -146 +146 @@
 
     if( n == 0 )
-        return( sign * j0f(x) );
+        return( sign * cephes_j0f(x) );
     if( n == 1 )
-        return( sign * j1f(x) );
+        return( sign * cephes_j1f(x) );
     if( n == 2 )
-        return( sign * (2.0 * j1f(x) / x  -  j0f(x)) );
+        return( sign * (2.0 * cephes_j1f(x) / x  -  cephes_j0f(x)) );
 
     if( x < MACHEP )
@@ -189 +189 @@
 
     if( r > ans )  /* if( fabs(pk) > fabs(pkm1) ) */
-        ans = sign * j1f(x)/pk;
+        ans = sign * cephes_j1f(x)/pk;
     else
-        ans = sign * j0f(x)/pkm1;
+        ans = sign * cephes_j0f(x)/pkm1;
     return( ans );
 }
@@ -197 +197 @@
 
 #if FLOAT_SIZE>4
-#define sas_JN jn
+#define sas_JN cephes_jn
 #else
-#define sas_JN jnf
+#define sas_JN cephes_jnf
 #endif