Change round to cephes_round in cephes library. Fix other use of basi…

…c.random
scipy · Dec 26, 2005 · 4f93f98 · 4f93f98
1 parent e5573a7
commit 4f93f98
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Lib/fftpack/tests/test_basic.py b/Lib/fftpack/tests/test_basic.py
@@ -22,7 +22,7 @@
 from scipy.base import arange, add, array, asarray, zeros, dot, exp, pi,\
      swapaxes
 
-from scipy.basic.random import rand
+from scipy.random import rand
 def random(size):
     return rand(*size)
 

diff --git a/Lib/special/_cephesmodule.c b/Lib/special/_cephesmodule.c
@@ -181,7 +181,7 @@ static void * ndtri_data[] = { (void *)ndtri, (void *)ndtri, };
 
 static void * psi_data[] = { (void *)psi, (void *)psi, (void *)cpsi_wrap, (void *)cpsi_wrap};
 static void * rgamma_data[] = { (void *)rgamma, (void *)rgamma, (void *)crgamma_wrap, (void *)crgamma_wrap};
-static void * round_data[] = { (void *)round, (void *)round, };
+static void * round_data[] = { (void *)cephes_round, (void *)cephes_round, };
 static void * sindg_data[] = { (void *)sindg, (void *)sindg, };
 static void * cosdg_data[] = { (void *)cosdg, (void *)cosdg, };
 static void * radian_data[] = { (void *)radian, (void *)radian, };

diff --git a/Lib/special/cephes.h b/Lib/special/cephes.h
@@ -139,6 +139,7 @@ extern void revers ( double y[], double x[], int n );
  */
 extern double rgamma ( double x );
 extern double round ( double x );
+extern double cephes_round ( double x );
 
 /*
 extern int sprec ( void );

diff --git a/Lib/special/cephes/round.c b/Lib/special/cephes/round.c
@@ -6,9 +6,9 @@
  *
  * SYNOPSIS:
  *
- * double x, y, round();
+ * double x, y, cephes_round();
  *
- * y = round(x);
+ * y = cephes_round(x);
  *
  *
  *
@@ -38,10 +38,10 @@ Direct inquiries to 30 Frost Street, Cambridge, MA 02140
 double floor();
 #else
 extern double floor(double);
-double round(double);
+double cephes_round(double);
 #endif
 
-double round(x)
+double cephes_round(x)
 double x;
 {
 double y, r;