Changeset 8116 for trunk/psLib/src/db/psDB.c

Timestamp:

Aug 3, 2006, 5:50:56 PM (20 years ago)

Author:

jhoblitt

Message:

psDB floating point epsilon support take 2

File:

• trunk/psLib/src/db/psDB.c (modified) (2 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-04 02:19:37 $
+ *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-04 03:50:56 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -1591 +1591 @@
         psStringAppend(&query, "%s=%d", item->name, (int)(item->data.S32));
     } else if ((item->type == PS_DATA_F32) || (item->type == PS_TYPE_F32)) {
-        psStringAppend(&query, "ABS(%s - %d) < %.6f", item->name, (int)(item->data.S32), FLT_EPSILON);
+        psStringAppend(&query, "(ABS(%s - %.8f) < %.8f)", item->name, (float)(item->data.F32), FLT_EPSILON * 10);
     } else if ((item->type == PS_DATA_F64) || (item->type == PS_TYPE_F64)) {
-        psStringAppend(&query, "ABS(%s - %d) < %.10f", item->name, (int)(item->data.S32), DBL_EPSILON);
+        psStringAppend(&query, "(ABS(%s - %.17f) < %.17f)", item->name, (double)(item->data.F64), DBL_EPSILON * 10);
     } else if ((item->type == PS_DATA_BOOL) || (item->type == PS_TYPE_BOOL)) {
         psStringAppend(&query, "%s=%d", item->name, (int)(item->data.B));