Changeset 4409 for trunk/psLib/src/math

Timestamp:

Jun 28, 2005, 10:17:52 AM (21 years ago)

Author:

drobbin

Message:

updated files in accordance with requested revisions in apidelta-report-cycle6

Location:

trunk/psLib/src/math

Files:

• psStats.c (modified) (5 diffs)
• psStats.h (modified) (3 diffs)
• psUnaryOp.c (modified) (2 diffs)
• psUnaryOp.h (modified) (2 diffs)

trunk/psLib/src/math/psStats.c

@@ -14 +14 @@
  *      stats->binsize
  *
- *  @version $Revision: 1.135 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 02:02:05 $
+ *  @version $Revision: 1.136 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 20:17:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1987 +1987 @@
  *****************************************************************************/
 psHistogram* psVectorHistogram(psHistogram* out,
-                               const psVector* in,
+                               const psVector* values,
                                const psVector* errors,
                                const psVector* mask,
-                               psU32 maskVal)
+                               psMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(out, NULL);
@@ -1999 +1999 @@
     PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, NULL);
     PS_ASSERT_INT_NONNEGATIVE(out->nums->n, NULL);
-    PS_ASSERT_VECTOR_NON_NULL(in, out);
+    PS_ASSERT_VECTOR_NON_NULL(values, out);
     if (mask != NULL) {
-        PS_ASSERT_VECTORS_SIZE_EQUAL(in, mask, NULL);
+        PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, NULL);
         PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
     }
     if (errors != NULL) {
-        PS_ASSERT_VECTORS_SIZE_EQUAL(in, errors, NULL);
-        PS_ASSERT_VECTOR_TYPE(errors, in->type.type, NULL);
+        PS_ASSERT_VECTORS_SIZE_EQUAL(values, errors, NULL);
+        PS_ASSERT_VECTOR_TYPE(errors, values->type.type, NULL);
     }
 
@@ -2021 +2021 @@
 
     // Convert input and errors vectors to F32 if necessary.
-    inF32 = p_psConvertToF32((psVector *) in);
+    inF32 = p_psConvertToF32((psVector *) values);
     if (inF32 == NULL) {
-        inF32 = (psVector *) in;
+        inF32 = (psVector *) values;
         mustFreeVectorIn = 0;
     }
@@ -2187 +2187 @@
                        const psVector* errors,
                        const psVector* mask,
-                       psU32 maskVal)
+                       psMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(stats, NULL);

trunk/psLib/src/math/psStats.h

@@ -14 +14 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 02:30:49 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 20:17:52 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -94 +94 @@
     const psVector* errors,  ///< Errors.
     const psVector* mask,    ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL
-    psU32 maskVal            ///< Only mask elements with one of these bits set in maskVector
+    psMaskType maskVal       ///< Only mask elements with one of these bits set in maskVector
 );
 
@@ -160 +160 @@
 psHistogram* psVectorHistogram(
     psHistogram* out,                  ///< Histogram data
-    const psVector* in,                ///< Vector to analyse
+    const psVector* values,            ///< Vector to analyse
     const psVector* errors,            ///< Errors
     const psVector* mask,              ///< Mask dat for input vector
-    psU32 maskVal                      ///< Mask value
+    psMaskType maskVal                 ///< Mask value
 );
 

trunk/psLib/src/math/psUnaryOp.c

@@ -30 +30 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 20:26:55 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 20:17:52 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -304 +304 @@
 }
 
-psPtr psUnaryOp(psPtr out, psPtr in, char *op)
+psPtr psUnaryOp(psPtr out, const psPtr in, const char *op)
 {
     #define psUnaryOp_EXIT { \

trunk/psLib/src/math/psUnaryOp.h

@@ -30 +30 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 20:17:52 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -61 +61 @@
 psType* psUnaryOp(
     psPtr out,                         ///< Output type, either psImage or psVector.
-    psPtr in,                          ///< Input, either psImage or psVector.
-    char *op                           ///< Operator.
+    const psPtr in,                    ///< Input, either psImage or psVector.
+    const char *op                     ///< Operator.
 );