Changeset 4409 for trunk/psLib/src/math/psStats.c

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

File:

• trunk/psLib/src/math/psStats.c (modified) (5 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);