Changeset 11759 for trunk/psLib/src/math/psHistogram.c

Timestamp:

Feb 12, 2007, 5:01:24 PM (19 years ago)

Author:

Paul Price

Message:

Fixing bug 843 by modifying functions that (unnecessarily) returned an input to return a bool.

File:

• trunk/psLib/src/math/psHistogram.c (modified) (8 diffs)

trunk/psLib/src/math/psHistogram.c

@@ -5 +5 @@
  *  @author GLG (MHPCC), EAM (IfA)
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 01:15:49 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-13 03:01:24 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -46 +46 @@
 with the specifed upper and lower limits, and the specifed number of bins.
 This routine will also set the bounds for each of the bins.
- 
+
 Input:
     lower
@@ -92 +92 @@
 psHistogramAllocGeneric(bounds): allocate a non-uniform histogram structure
 with the specifed bounds.
- 
+
 Input:
     bounds
@@ -144 +144 @@
 histogram bin which contains the point.  The width of that boxcar is defined
 as 2.35 * error.
- 
+
 XXX: Must test this.
  *****************************************************************************/
@@ -218 +218 @@
 in that histogram structure in accordance with the input data "in" and the,
 possibly NULL, mask vector.
- 
+
 Inputs:
     out
@@ -227 +227 @@
     The histogram structure "out".
  *****************************************************************************/
-psHistogram* psVectorHistogram(psHistogram* out,
+bool psVectorHistogram(psHistogram* out,
                                const psVector* values,
                                const psVector* errors,
@@ -234 +234 @@
 {
     psTrace("psLib.math", 3, "---- %s() begin  ----\n", __func__);
-    PS_ASSERT_PTR_NON_NULL(out, NULL);
-    PS_ASSERT_VECTOR_NON_NULL(out->bounds, NULL);
-    PS_ASSERT_VECTOR_TYPE(out->bounds, PS_TYPE_F32, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(out->bounds->n, NULL);
-    PS_ASSERT_VECTOR_NON_NULL(out->nums, NULL);
-    PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(out->nums->n, NULL);
+    PS_ASSERT_PTR_NON_NULL(out, false);
+    PS_ASSERT_VECTOR_NON_NULL(out->bounds, false);
+    PS_ASSERT_VECTOR_TYPE(out->bounds, PS_TYPE_F32, false);
+    PS_ASSERT_INT_NONNEGATIVE(out->bounds->n, false);
+    PS_ASSERT_VECTOR_NON_NULL(out->nums, false);
+    PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, false);
+    PS_ASSERT_INT_NONNEGATIVE(out->nums->n, false);
     PS_ASSERT_VECTOR_NON_NULL(values, out);
     if (mask) {
-        PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, NULL);
-        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
+        PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, false);
+        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, false);
     }
     if (errors) {
-        PS_ASSERT_VECTORS_SIZE_EQUAL(values, errors, NULL);
-        PS_ASSERT_VECTOR_TYPE(errors, values->type.type, NULL);
+        PS_ASSERT_VECTORS_SIZE_EQUAL(values, errors, false);
+        PS_ASSERT_VECTOR_TYPE(errors, values->type.type, false);
     }
 
@@ -329 +329 @@
 
     psTrace("psLib.math", 3, "---- %s() end  ----\n", __func__);
-    return (out);
-}
-
+    return true;
+}
+