Changeset 3182 for trunk/psLib/src/dataManip

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/dataManip

Files:

• Makefile.am (modified) (2 diffs)
• psBinaryOp.c (added)
• psBinaryOp.h (added)
• psConstants.h (modified) (2 diffs)
• psFunctions.c (modified) (2 diffs)
• psMatrixVectorArithmetic.c (deleted)
• psMatrixVectorArithmetic.h (deleted)
• psMinimize.c (modified) (4 diffs)
• psUnaryOp.c (added)
• psUnaryOp.h (added)

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));
         }