Changeset 13918

Timestamp:

Jun 20, 2007, 10:21:30 AM (19 years ago)

Author:

Paul Price

Message:

Adding psVectorBoxcar for boxcar smoothing

Location:

trunk/psLib/src/math

Files:

• psVectorSmooth.c (modified) (2 diffs)
• psVectorSmooth.h (modified) (2 diffs)

trunk/psLib/src/math/psVectorSmooth.c

@@ -13 +13 @@
 #include "psLogMsg.h"
 #include "psVector.h"
+#include "psAssert.h"
+#include "psConstants.h"
+
 #include "psVectorSmooth.h"
-#include "psAssert.h"
-
 
 psVector *psVectorSmooth(psVector *output,
@@ -106 +107 @@
     return output;
 }
+
+
+
+psVector *psVectorBoxcar(psVector *output,
+                         const psVector *input,
+                         int size
+                        )
+{
+    PS_ASSERT_VECTOR_NON_NULL(input, NULL);
+    PS_ASSERT_INT_POSITIVE(size, NULL);
+
+    long num = input->n;                // Number of elements
+    output = psVectorRecycle(output, num, input->type.type);
+    psVector *nums = psVectorAlloc(num, PS_TYPE_U32); // Number of elements in each bin
+    psU32 *numsData = nums->data.U32;   // Dereferenced version
+
+    psVectorInit(output, 0.0);
+    psVectorInit(nums, 0);
+
+
+    #define VECTOR_BOXCAR_CASE(TYPE) \
+  case PS_TYPE_##TYPE: { \
+      /* Dereference data */ \
+      ps##TYPE *outputData = output->data.TYPE; \
+      ps##TYPE *inputData = input->data.TYPE; \
+      /* Smooth the vector */ \
+      for (long i = 0; i < num; i++) { \
+          for (long j = PS_MAX(0, i - size); j < PS_MIN(num, i + size + 1); j++) { \
+              outputData[j] += inputData[i]; \
+              numsData[j]++; \
+          } \
+      } \
+      /* Normalisation */ \
+      for (long i = 0; i < num; i++) { \
+          outputData[i] /= numsData[i]; \
+      } \
+  }
+
+    switch (input->type.type) {
+        VECTOR_BOXCAR_CASE(F32);
+        VECTOR_BOXCAR_CASE(F64);
+    default: {
+            char* typeStr;
+            PS_TYPE_NAME(typeStr, input->type.type);
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Type %s is not valid.", typeStr);
+            psFree(nums);
+            return NULL;
+        }
+    }
+    psFree(nums);
+    return output;
+}

trunk/psLib/src/math/psVectorSmooth.h

@@ -2 +2 @@
  * @brief smooth the input vector
  *
- * $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * $Date: 2007-01-23 22:47:23 $
+ * $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * $Date: 2007-06-20 20:21:30 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -13 +13 @@
 /// @{
 
-// Smooth a vector with a Gaussian
-psVector *psVectorSmooth(psVector *output, // Output vector, or NULL
-                         const psVector *input, // Input vector (F32 or F64 only)
-                         double sigma,  // Gausian width (standard deviations)
-                         double Nsigma  // Number of standard deviations for Gaussian to extend (either side)
+/// Smooth a vector with a Gaussian
+psVector *psVectorSmooth(psVector *output, ///< Output vector, or NULL
+                         const psVector *input, ///< Input vector (F32 or F64 only)
+                         double sigma,  ///< Gausian width (standard deviations)
+                         double Nsigma  ///< Number of standard deviations for Gaussian to extend
                         );
+
+/// Smooth a vector with a boxcar
+psVector *psVectorBoxcar(psVector *output, ///< Output vector, or NULL
+                         const psVector *input, ///< Input vector (F32 or F64 only)
+                         int size       ///< Boxcar size (one-sided size)
+    );
+
 /// @}
 #endif