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

Timestamp:

Jan 23, 2006, 12:25:31 PM (20 years ago)

Author:

gusciora

Message:

Misc code cleaning

File:

• trunk/psLib/src/math/psStats.c (modified) (5 diffs)

trunk/psLib/src/math/psStats.c

@@ -17 +17 @@
  *
  *
- *  @version $Revision: 1.159 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-23 20:44:29 $
+ *  @version $Revision: 1.160 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-23 22:25:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2317 +2317 @@
     psTrace(__func__, 5, "(lower, upper, n) is (%f, %f, %d)\n", lower, upper, n);
     PS_ASSERT_INT_POSITIVE(n, NULL);
-    PS_FLOAT_COMPARE(lower, upper, NULL);
+    PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(upper, lower, NULL);
 
     psS32 i = 0;                  // Loop index variable
@@ -2369 +2369 @@
     PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
     PS_ASSERT_VECTOR_TYPE(bounds, PS_TYPE_F32, NULL);
-    PS_INT_COMPARE(2, bounds->n, NULL);
+    PS_ASSERT_INT_LARGER_THAN_OR_EQUAL(bounds->n, 2, NULL);
 
     psHistogram* newHist = NULL;        // The new histogram structure
@@ -2437 +2437 @@
     PS_ASSERT_PTR_NON_NULL(out->nums, -1);
     PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, ((out->nums->n)-1), -2);
-    PS_FLOAT_COMPARE(0.0, error, -3);
+    PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(error, 0.0, -3);
+
     PS_ASSERT_FLOAT_WITHIN_RANGE(data, out->bounds->data.F32[0], out->bounds->data.F32[(out->bounds->n)-1], -4);
 
@@ -2756 +2757 @@
 
     if ((stats->options & PS_STAT_USE_RANGE) && (stats->min >= stats->max)) {
-        PS_FLOAT_COMPARE(stats->min, stats->max, stats);
+        PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(stats->max, stats->min, stats);
     }