Changeset 3182 for trunk/psLib/src

Timestamp:

Feb 9, 2005, 4:36:42 PM (21 years ago)

Author:

desonia

Message:

prepared the config/data directories to be installed into standard areas.

Location:

trunk/psLib/src

Files:

• astro/psCoord.c (modified) (6 diffs)
• astro/psTime.c (modified) (4 diffs)
• astronomy/astronomy.i (modified) (1 diff)
• astronomy/psCoord.c (modified) (6 diffs)
• astronomy/psTime.c (modified) (4 diffs)
• dataManip/Makefile.am (modified) (2 diffs)
• dataManip/psBinaryOp.c (added)
• dataManip/psBinaryOp.h (added)
• dataManip/psConstants.h (modified) (2 diffs)
• dataManip/psFunctions.c (modified) (2 diffs)
• dataManip/psMatrixVectorArithmetic.c (deleted)
• dataManip/psMatrixVectorArithmetic.h (deleted)
• dataManip/psMinimize.c (modified) (4 diffs)
• dataManip/psUnaryOp.c (added)
• dataManip/psUnaryOp.h (added)
• image/psImageStats.c (modified) (3 diffs)
• imageops/psImageStats.c (modified) (3 diffs)
• math/psBinaryOp.c (added)
• math/psBinaryOp.h (added)
• math/psConstants.h (modified) (2 diffs)
• math/psMinimize.c (modified) (4 diffs)
• math/psPolynomial.c (modified) (2 diffs)
• math/psSpline.c (modified) (2 diffs)
• math/psUnaryOp.c (added)
• math/psUnaryOp.h (added)
• psTest.c (modified) (1 diff)
• pslib.h (modified) (2 diffs)
• sys/psTrace.c (modified) (6 diffs)
• sysUtils/psTrace.c (modified) (6 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:45:06 $
+*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-10 02:36:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 {
     while (angle < FLT_EPSILON) {
-        angle+=M_PI;
-    }
-
-    while (angle >= M_PI) {
-        angle-=M_PI;
+        angle+=PS_PI;
+    }
+
+    while (angle >= PS_PI) {
+        angle-=PS_PI;
     }
     return(angle);
@@ -547 +547 @@
         R = PS_SQRT_F32((coord->x * coord->x) + (coord->y * coord->y));
         tmp->d = atan2(-coord->y, coord->x);
-        tmp->r = acos((R * M_PI) / 180.0);
+        tmp->r = acos((R * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_CAR) {
@@ -555 +555 @@
     } else if (projection->type == PS_PROJ_MER) {
         tmp->d = coord->x;
-        tmp->r = (2.0 * atan(exp((coord->y * M_PI / 180.0)))) - 180.0;
+        tmp->r = (2.0 * atan(exp((coord->y * PS_PI / 180.0)))) - 180.0;
 
     } else if (projection->type == PS_PROJ_AIT) {
-        chu1 = (coord->x * M_PI) / 720.0;
+        chu1 = (coord->x * PS_PI) / 720.0;
         chu1 *= chu1;
-        chu2 = (coord->y * M_PI) / 360.0;
+        chu2 = (coord->y * PS_PI) / 360.0;
         chu2 *= chu2;
         chu = PS_SQRT_F32(1.0 - chu1 - chu2);
-        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * M_PI) / 360.0);
-        tmp->r = asin((coord->y * chu * M_PI) / 180.0);
+        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * PS_PI) / 360.0);
+        tmp->r = asin((coord->y * chu * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_PAR) {
@@ -640 +640 @@
         // Wrap these to an acceptable range.  This assumes that all
         // angles are in radians.
-        tmp->r = fmod(tmp->r, 2*M_PI);
-        tmp->d = fmod(tmp->d, 2*M_PI);
+        tmp->r = fmod(tmp->r, 2*PS_PI);
+        tmp->d = fmod(tmp->d, 2*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;
@@ -731 +731 @@
         tmp = (psSphere* ) psAlloc(sizeof(psSphere));
         tmp->r = position->r + tmpR;
-        tmp->r = fmod(tmp->r, 2.0*M_PI);
+        tmp->r = fmod(tmp->r, 2.0*PS_PI);
         tmp->d = position->d + tmpD;
-        tmp->d = fmod(tmp->d, 2.0*M_PI);
+        tmp->d = fmod(tmp->d, 2.0*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:45:06 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
 
 /** Two times pi with double precision accuracy */
-#define TWOPI (2.0*M_PI)
+#define TWOPI (2.0*PS_PI)
 
 /** Conversion from radians to degrees */
-#define R2DEG = (180.0/M_PI)
+#define R2DEG = (180.0/PS_PI)
 
                 /** Maximum length of time string */
@@ -548 +548 @@
 
         t = 2000.0 + (mjd - 51544.03)/365.2422;
-        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*M_PI*t) + 0.007*cos(4.0*M_PI*t);
+        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*PS_PI*t) + 0.007*cos(4.0*PS_PI*t);
         result = dut->data.F64[0] + dut->data.F64[1]*(mjd - dut->data.F64[2]) - dut2ut1;
 
@@ -677 +677 @@
     }
 
-    // Create output sphere and convert arcsec to radians (i.e. x/60/60*M_PI/180)
+    // Create output sphere and convert arcsec to radians (i.e. x/60/60*PS_PI/180)
     output = psAlloc(sizeof(psSphere));
-    output->r = x * M_PI / 648000.0;
-    output->d = y * M_PI / 648000.0;
+    output->r = x * PS_PI / 648000.0;
+    output->d = y * PS_PI / 648000.0;
 
     return output;

trunk/psLib/src/astronomy/astronomy.i

@@ -17 +17 @@
 // add a method to add primitives to metadata
 %inline %{
-psBool psMetadataAddStr(psMetadata* md, psS32 where, const char* name, const char* comment, const char* value) {
+psBool psMetadataAddStr(psMetadata* md, psS32 where, const char* name, 
+const char* comment, const char* value) {
     return psMetadataAdd(md,where,name,PS_TYPE_PTR, PS_META_STR,comment,value);
 }
-psBool psMetadataAddF32(psMetadata* md, psS32 where, const char* name, const char* comment, psF32 value) {
+psBool psMetadataAddF32(psMetadata* md,
+                        psS32 where,
+                        const char* name,
+                        const char* comment,
+                        psF32 value)
+{
     return psMetadataAdd(md,where,name,PS_TYPE_F32, PS_META_PRIMITIVE,comment,value);
 }
-psBool psMetadataAddF64(psMetadata* md, psS32 where, const char* name, const char* comment, psF64 value) {
+
+psBool psMetadataAddF64(psMetadata* md,
+                        psS32 where,
+                        const char* name,
+                        const char* comment,
+                        psF64 value)
+{
     return psMetadataAdd(md,where,name,PS_TYPE_F64, PS_META_PRIMITIVE,comment,value);
 }
-psBool psMetadataAddS32(psMetadata* md, psS32 where, const char* name, const char* comment, psS32 value) {
+
+psBool psMetadataAddS32(psMetadata* md,
+                        psS32 where,
+                        const char* name,
+                        const char* comment,
+                        psS32 value)
+{
     return psMetadataAdd(md,where,name,PS_TYPE_S32, PS_META_PRIMITIVE,comment,value);
 }
 
-psMetadataItem* psMetadataItemAllocStr(const char* name, const char* comment, const char* value) {
+psMetadataItem* psMetadataItemAllocStr(const char* name,
+                                       const char* comment,
+                                       const char* value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_PTR, PS_META_STR, comment, value);
 }
-psMetadataItem* psMetadataItemAllocF32(const char* name, const char* comment, psF32 value) {
+
+psMetadataItem* psMetadataItemAllocF32(const char* name,
+                                       const char* comment,
+                                       psF32 value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_F32, PS_META_PRIMITIVE, comment, value);
 }
-psMetadataItem* psMetadataItemAllocF64(const char* name, const char* comment, psF64 value) {
+
+psMetadataItem* psMetadataItemAllocF64(const char* name,
+                                       const char* comment,
+                                       psF64 value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_F64, PS_META_PRIMITIVE, comment, value);
 }
-psMetadataItem* psMetadataItemAllocS32(const char* name, const char* comment, psS32 value) {
+
+psMetadataItem* psMetadataItemAllocS32(const char* name,
+                                       const char* comment,
+                                       psS32 value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_S32, PS_META_PRIMITIVE, comment, value);
 }

trunk/psLib/src/astronomy/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:45:06 $
+*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-10 02:36:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 {
     while (angle < FLT_EPSILON) {
-        angle+=M_PI;
-    }
-
-    while (angle >= M_PI) {
-        angle-=M_PI;
+        angle+=PS_PI;
+    }
+
+    while (angle >= PS_PI) {
+        angle-=PS_PI;
     }
     return(angle);
@@ -547 +547 @@
         R = PS_SQRT_F32((coord->x * coord->x) + (coord->y * coord->y));
         tmp->d = atan2(-coord->y, coord->x);
-        tmp->r = acos((R * M_PI) / 180.0);
+        tmp->r = acos((R * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_CAR) {
@@ -555 +555 @@
     } else if (projection->type == PS_PROJ_MER) {
         tmp->d = coord->x;
-        tmp->r = (2.0 * atan(exp((coord->y * M_PI / 180.0)))) - 180.0;
+        tmp->r = (2.0 * atan(exp((coord->y * PS_PI / 180.0)))) - 180.0;
 
     } else if (projection->type == PS_PROJ_AIT) {
-        chu1 = (coord->x * M_PI) / 720.0;
+        chu1 = (coord->x * PS_PI) / 720.0;
         chu1 *= chu1;
-        chu2 = (coord->y * M_PI) / 360.0;
+        chu2 = (coord->y * PS_PI) / 360.0;
         chu2 *= chu2;
         chu = PS_SQRT_F32(1.0 - chu1 - chu2);
-        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * M_PI) / 360.0);
-        tmp->r = asin((coord->y * chu * M_PI) / 180.0);
+        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * PS_PI) / 360.0);
+        tmp->r = asin((coord->y * chu * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_PAR) {
@@ -640 +640 @@
         // Wrap these to an acceptable range.  This assumes that all
         // angles are in radians.
-        tmp->r = fmod(tmp->r, 2*M_PI);
-        tmp->d = fmod(tmp->d, 2*M_PI);
+        tmp->r = fmod(tmp->r, 2*PS_PI);
+        tmp->d = fmod(tmp->d, 2*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;
@@ -731 +731 @@
         tmp = (psSphere* ) psAlloc(sizeof(psSphere));
         tmp->r = position->r + tmpR;
-        tmp->r = fmod(tmp->r, 2.0*M_PI);
+        tmp->r = fmod(tmp->r, 2.0*PS_PI);
         tmp->d = position->d + tmpD;
-        tmp->d = fmod(tmp->d, 2.0*M_PI);
+        tmp->d = fmod(tmp->d, 2.0*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;

trunk/psLib/src/astronomy/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:45:06 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
 
 /** Two times pi with double precision accuracy */
-#define TWOPI (2.0*M_PI)
+#define TWOPI (2.0*PS_PI)
 
 /** Conversion from radians to degrees */
-#define R2DEG = (180.0/M_PI)
+#define R2DEG = (180.0/PS_PI)
 
                 /** Maximum length of time string */
@@ -548 +548 @@
 
         t = 2000.0 + (mjd - 51544.03)/365.2422;
-        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*M_PI*t) + 0.007*cos(4.0*M_PI*t);
+        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*PS_PI*t) + 0.007*cos(4.0*PS_PI*t);
         result = dut->data.F64[0] + dut->data.F64[1]*(mjd - dut->data.F64[2]) - dut2ut1;
 
@@ -677 +677 @@
     }
 
-    // Create output sphere and convert arcsec to radians (i.e. x/60/60*M_PI/180)
+    // Create output sphere and convert arcsec to radians (i.e. x/60/60*PS_PI/180)
     output = psAlloc(sizeof(psSphere));
-    output->r = x * M_PI / 648000.0;
-    output->d = y * M_PI / 648000.0;
+    output->r = x * PS_PI / 648000.0;
+    output->d = y * PS_PI / 648000.0;
 
     return output;

trunk/psLib/src/dataManip/Makefile.am

@@ -11 +11 @@
 noinst_LTLIBRARIES = libpslibdataManip.la
 
-libpslibdataManip_la_SOURCES = \
-        psMatrixVectorArithmetic.c \
-        psStats.c  \
-        psFunctions.c \
-        psMatrix.c \
-        psVectorFFT.c \
-        psMinimize.c \
-        psRandom.c 
+libpslibdataManip_la_SOURCES = psUnaryOp.c psBinaryOp.c psStats.c \
+                psFunctions.c psMatrix.c psVectorFFT.c psMinimize.c psRandom.c
            
 BUILT_SOURCES = psDataManipErrors.h
@@ -32 +26 @@
         psFunctions.h \
         psMatrix.h \
-        psMatrixVectorArithmetic.h \
+    psBinaryOp.h \
+    psUnaryOp.h \
         psVectorFFT.h \
         psMinimize.h \

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-10 19:47:11 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
 
 #define PS_COT(X) (1.0 / atan(X))
-#define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)
-#define MIN_TO_RAD(MINUTES) ((MINUTES) * M_PI / (180.0 * 60.0))
-#define SEC_TO_RAD(SECONDS) ((SECONDS) * M_PI / (180.0 * 60.0 * 60.0))
-#define RAD_TO_DEG(RADIANS) ((RADIANS) * 180.0 / M_PI)
-#define RAD_TO_MIN(RADIANS) ((RADIANS) * 180.0 * 60.0 / M_PI)
-#define RAD_TO_SEC(RADIANS) ((RADIANS) * 180.0 * 60.0 * 60.0 / M_PI)
+#define DEG_TO_RAD(DEGREES) ((DEGREES) * PS_PI / 180.0)
+#define MIN_TO_RAD(MINUTES) ((MINUTES) * PS_PI / (180.0 * 60.0))
+#define SEC_TO_RAD(SECONDS) ((SECONDS) * PS_PI / (180.0 * 60.0 * 60.0))
+#define RAD_TO_DEG(RADIANS) ((RADIANS) * 180.0 / PS_PI)
+#define RAD_TO_MIN(RADIANS) ((RADIANS) * 180.0 * 60.0 / PS_PI)
+#define RAD_TO_SEC(RADIANS) ((RADIANS) * 180.0 * 60.0 * 60.0 / PS_PI)
 
 /*****************************************************************************

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-09 20:56:17 $
+ *  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -975 +975 @@
 
     if (normal == true) {
-        tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma));
+        tmp = 1.0 / PS_SQRT_F32(2.0 * PS_PI * (sigma * sigma));
     }
 

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:10 $
+ *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -538 +538 @@
         psF64 flux = normalization * exp(-( u*u/(2.0 * sigmaX * sigmaX) +
                                             v*v/(2.0 * sigmaY * sigmaY)))/
-                     (2.0 * M_PI * sigmaX * sigmaY);
+                     (2.0 * PS_PI * sigmaX * sigmaY);
         out->data.F32[i] = flux;
 
@@ -865 +865 @@
     for (psS32 i=0;i<n;i++) {
         // NR 5.8.4
-        psF64 Y = cos(M_PI * (0.5 + ((psF32) i)) / ((psF32) n));
+        psF64 Y = cos(PS_PI * (0.5 + ((psF32) i)) / ((psF32) n));
         psF64 X = (Y + bma + bpa) - 1.0;
         tmpScalar.data.F64 = X;
@@ -893 +893 @@
         for (k=0;k<n;k++) {
             sum+= f->data.F64[k] *
-                  cos(M_PI * ((psF32) j) * (0.5 + ((psF32) k)) / ((psF32) n));
+                  cos(PS_PI * ((psF32) j) * (0.5 + ((psF32) k)) / ((psF32) n));
         }
 

trunk/psLib/src/image/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:11 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -139 +139 @@
     for (i = 0; i < n; i++) {
         tmp = (double)(n - i);
-        tmp = (M_PI * (tmp - 0.5)) / ((double)n);
+        tmp = (PS_PI * (tmp - 0.5)) / ((double)n);
         scalingFactors[i] = cos(tmp);
     }
@@ -348 +348 @@
     // Chebyshev polynomials are 0.
     for (x = 0; x < input->numRows; x++) {
-        double xTmp = cos(M_PI * (0.5 + ((float) x)) / ((float) input->numRows));
+        double xTmp = cos(PS_PI * (0.5 + ((float) x)) / ((float) input->numRows));
         double xNode = - ((xTmp + bma + bpa) - 1.0);
         double xOrig = ((float) input->numRows) * (xNode - min) / (max - min);
 
         for (y = 0; y < input->numCols; y++) {
-            double yTmp = cos(M_PI * (0.5 + ((float) y)) / ((float) input->numCols));
+            double yTmp = cos(PS_PI * (0.5 + ((float) y)) / ((float) input->numCols));
             double yNode = - ((yTmp + bma + bpa) - 1.0);
             double yOrig = ((float) input->numCols) * (yNode - min) / (max - min);

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:11 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -139 +139 @@
     for (i = 0; i < n; i++) {
         tmp = (double)(n - i);
-        tmp = (M_PI * (tmp - 0.5)) / ((double)n);
+        tmp = (PS_PI * (tmp - 0.5)) / ((double)n);
         scalingFactors[i] = cos(tmp);
     }
@@ -348 +348 @@
     // Chebyshev polynomials are 0.
     for (x = 0; x < input->numRows; x++) {
-        double xTmp = cos(M_PI * (0.5 + ((float) x)) / ((float) input->numRows));
+        double xTmp = cos(PS_PI * (0.5 + ((float) x)) / ((float) input->numRows));
         double xNode = - ((xTmp + bma + bpa) - 1.0);
         double xOrig = ((float) input->numRows) * (xNode - min) / (max - min);
 
         for (y = 0; y < input->numCols; y++) {
-            double yTmp = cos(M_PI * (0.5 + ((float) y)) / ((float) input->numCols));
+            double yTmp = cos(PS_PI * (0.5 + ((float) y)) / ((float) input->numCols));
             double yNode = - ((yTmp + bma + bpa) - 1.0);
             double yOrig = ((float) input->numCols) * (yNode - min) / (max - min);

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-10 19:47:11 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
 
 #define PS_COT(X) (1.0 / atan(X))
-#define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)
-#define MIN_TO_RAD(MINUTES) ((MINUTES) * M_PI / (180.0 * 60.0))
-#define SEC_TO_RAD(SECONDS) ((SECONDS) * M_PI / (180.0 * 60.0 * 60.0))
-#define RAD_TO_DEG(RADIANS) ((RADIANS) * 180.0 / M_PI)
-#define RAD_TO_MIN(RADIANS) ((RADIANS) * 180.0 * 60.0 / M_PI)
-#define RAD_TO_SEC(RADIANS) ((RADIANS) * 180.0 * 60.0 * 60.0 / M_PI)
+#define DEG_TO_RAD(DEGREES) ((DEGREES) * PS_PI / 180.0)
+#define MIN_TO_RAD(MINUTES) ((MINUTES) * PS_PI / (180.0 * 60.0))
+#define SEC_TO_RAD(SECONDS) ((SECONDS) * PS_PI / (180.0 * 60.0 * 60.0))
+#define RAD_TO_DEG(RADIANS) ((RADIANS) * 180.0 / PS_PI)
+#define RAD_TO_MIN(RADIANS) ((RADIANS) * 180.0 * 60.0 / PS_PI)
+#define RAD_TO_SEC(RADIANS) ((RADIANS) * 180.0 * 60.0 * 60.0 / PS_PI)
 
 /*****************************************************************************

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:10 $
+ *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -538 +538 @@
         psF64 flux = normalization * exp(-( u*u/(2.0 * sigmaX * sigmaX) +
                                             v*v/(2.0 * sigmaY * sigmaY)))/
-                     (2.0 * M_PI * sigmaX * sigmaY);
+                     (2.0 * PS_PI * sigmaX * sigmaY);
         out->data.F32[i] = flux;
 
@@ -865 +865 @@
     for (psS32 i=0;i<n;i++) {
         // NR 5.8.4
-        psF64 Y = cos(M_PI * (0.5 + ((psF32) i)) / ((psF32) n));
+        psF64 Y = cos(PS_PI * (0.5 + ((psF32) i)) / ((psF32) n));
         psF64 X = (Y + bma + bpa) - 1.0;
         tmpScalar.data.F64 = X;
@@ -893 +893 @@
         for (k=0;k<n;k++) {
             sum+= f->data.F64[k] *
-                  cos(M_PI * ((psF32) j) * (0.5 + ((psF32) k)) / ((psF32) n));
+                  cos(PS_PI * ((psF32) j) * (0.5 + ((psF32) k)) / ((psF32) n));
         }
 

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-09 20:56:17 $
+ *  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -975 +975 @@
 
     if (normal == true) {
-        tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma));
+        tmp = 1.0 / PS_SQRT_F32(2.0 * PS_PI * (sigma * sigma));
     }
 

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-09 20:56:17 $
+ *  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -975 +975 @@
 
     if (normal == true) {
-        tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma));
+        tmp = 1.0 / PS_SQRT_F32(2.0 * PS_PI * (sigma * sigma));
     }
 

trunk/psLib/src/psTest.c

@@ -11 +11 @@
 //
 
-
+#include <sys/types.h>
+#include <unistd.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/wait.h>
 #include <stdbool.h>

trunk/psLib/src/pslib.h

@@ -9 +9 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:54:10 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-10 02:36:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -126 +126 @@
 #include "psMatrix.h"
 
-/// @defgroup MatrixVectorArithmetic Matrix Vector Arithmetic Operations
+/// @defgroup MatrixArithmetic Matrix Arithmetic Operations
 /// @ingroup DataManip
-#include "psMatrixVectorArithmetic.h"
+#include "psBinaryOp.h"
+#include "psUnaryOp.h"
 
 #include "psRandom.h"

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:11 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40 +40 @@
 #ifndef PS_NO_TRACE
 
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -146 +147 @@
 /*****************************************************************************
 componentAdd(): Adds the component named "addNodeName" to the root tree.
- 
-NOTE: replace the call to strsep() with a call to strtok(), which conforms
-to ANSI-C.
  *****************************************************************************/
 static psBool componentAdd(const char *addNodeName, psS32 level)
@@ -180 +178 @@
 
     strcpy(name, addNodeName);
-    pname = &name[1];
+    pname = name+1;
     // Iterate through the components of addNodeName.  Strip off the first
     // component of the name, find that in the root tree, or add it if it
@@ -186 +184 @@
 
     while (pname != NULL) {
-        firstComponent = strsep(&pname, ".");
+        firstComponent = pname;
+        pname = strtok(pname, ".");
+        if (pname != NULL) {
+            *pname = '\0';
+            pname++;
+        }
         nodeExists = 0;
         for (i = 0; i < currentNode->n; i++) {
@@ -324 +327 @@
     pname = &name[1];
     while (pname != NULL) {
-        firstComponent = strsep(&pname, ".");
+        firstComponent = pname;
+        pname = strtok(pname, ".");
+        if (pname != NULL) {
+            *pname = '\0';
+            pname++;
+        }
         for (i = 0; i < currentNode->n; i++) {
             if (NULL == currentNode->subcomp[i]) {

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:11 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40 +40 @@
 #ifndef PS_NO_TRACE
 
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -146 +147 @@
 /*****************************************************************************
 componentAdd(): Adds the component named "addNodeName" to the root tree.
- 
-NOTE: replace the call to strsep() with a call to strtok(), which conforms
-to ANSI-C.
  *****************************************************************************/
 static psBool componentAdd(const char *addNodeName, psS32 level)
@@ -180 +178 @@
 
     strcpy(name, addNodeName);
-    pname = &name[1];
+    pname = name+1;
     // Iterate through the components of addNodeName.  Strip off the first
     // component of the name, find that in the root tree, or add it if it
@@ -186 +184 @@
 
     while (pname != NULL) {
-        firstComponent = strsep(&pname, ".");
+        firstComponent = pname;
+        pname = strtok(pname, ".");
+        if (pname != NULL) {
+            *pname = '\0';
+            pname++;
+        }
         nodeExists = 0;
         for (i = 0; i < currentNode->n; i++) {
@@ -324 +327 @@
     pname = &name[1];
     while (pname != NULL) {
-        firstComponent = strsep(&pname, ".");
+        firstComponent = pname;
+        pname = strtok(pname, ".");
+        if (pname != NULL) {
+            *pname = '\0';
+            pname++;
+        }
         for (i = 0; i < currentNode->n; i++) {
             if (NULL == currentNode->subcomp[i]) {