Changeset 17565

Timestamp:

May 7, 2008, 1:11:30 PM (18 years ago)

Author:

eugene

Message:

for a histogram, value is in bin i if bound[i] <= value < bound[i]; made code consistent with this definition

File:

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

trunk/psLib/src/math/psHistogram.c

@@ -5 +5 @@
  *  @author GLG (MHPCC), EAM (IfA)
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-28 00:34:11 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-05-07 23:11:30 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -290 +290 @@
                     binNum = PS_MIN (binNum, numBins - 1);
 
+                    // value is in bin 'i' if bound[i] <= value < bound[i]
+
                     // we may slightly overshoot or undershoot.  creep up or down on the true bin
                     if (inF32->data.F32[i] < out->bounds->data.F32[binNum]) {
@@ -298 +300 @@
                         
                     }
-                    if (inF32->data.F32[i] > out->bounds->data.F32[binNum+1]) {
+                    if (inF32->data.F32[i] >= out->bounds->data.F32[binNum+1]) {
                         psTrace("psLib.math", 6, "missed target bin, adjusting: %f vs %f to %f\n", inF32->data.F32[i], out->bounds->data.F32[binNum], out->bounds->data.F32[binNum+1]);
-                        while ((inF32->data.F32[i] > out->bounds->data.F32[binNum+1]) && (binNum < numBins - 1)) {
+                        while ((inF32->data.F32[i] >= out->bounds->data.F32[binNum+1]) && (binNum < numBins - 1)) {
                             binNum ++;
                         }