Changeset 845

Timestamp:

Jun 3, 2004, 3:03:11 PM (22 years ago)

Author:

evanalst

Message:

Add preprocessor condition for DARWIN and sqrtf versus sqrt

Location:

trunk/psLib/src

Files:

• dataManip/psFunctions.c (modified) (2 diffs)
• dataManip/psMinimize.c (modified) (1 diff)
• math/psMinimize.c (modified) (1 diff)
• math/psPolynomial.c (modified) (2 diffs)
• math/psSpline.c (modified) (2 diffs)

trunk/psLib/src/dataManip/psFunctions.c

@@ -6 +6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:21 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-04 01:03:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 
     if (normal == 1) {
+        #ifdef DARWIN
+        tmp = 1.0 / (float)sqrt(2.0 * M_PI * (stddev * stddev));
+        #else
+
         tmp = 1.0 / sqrtf(2.0 * M_PI * (stddev * stddev));
+        #endif
+
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
     } else {

trunk/psLib/src/dataManip/psMinimize.c

@@ -260 +260 @@
     *flag = 1;
     for (i=firstTerm; i<=lastTerm; i++) {
+        #ifdef DARWIN
+        error[i] = (float)sqrt(y[i][i]);
+        #else
+
         error[i] = sqrtf(y[i][i]);
+        #endif
+
         if (!((B[i]  <= (2.0f * error[i])) &&
                 ((-2.0f * error[i]) <= B[i]))) {

trunk/psLib/src/math/psMinimize.c

@@ -260 +260 @@
     *flag = 1;
     for (i=firstTerm; i<=lastTerm; i++) {
+        #ifdef DARWIN
+        error[i] = (float)sqrt(y[i][i]);
+        #else
+
         error[i] = sqrtf(y[i][i]);
+        #endif
+
         if (!((B[i]  <= (2.0f * error[i])) &&
                 ((-2.0f * error[i]) <= B[i]))) {

trunk/psLib/src/math/psPolynomial.c

@@ -6 +6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:21 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-04 01:03:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 
     if (normal == 1) {
+        #ifdef DARWIN
+        tmp = 1.0 / (float)sqrt(2.0 * M_PI * (stddev * stddev));
+        #else
+
         tmp = 1.0 / sqrtf(2.0 * M_PI * (stddev * stddev));
+        #endif
+
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
     } else {

trunk/psLib/src/math/psSpline.c

@@ -6 +6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:21 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-04 01:03:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 
     if (normal == 1) {
+        #ifdef DARWIN
+        tmp = 1.0 / (float)sqrt(2.0 * M_PI * (stddev * stddev));
+        #else
+
         tmp = 1.0 / sqrtf(2.0 * M_PI * (stddev * stddev));
+        #endif
+
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
     } else {