Changeset 4419

Timestamp:

Jun 28, 2005, 1:28:31 PM (21 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

• dataManip/psConstants.h (modified) (4 diffs)
• math/psConstants.h (modified) (4 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 23:28:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -111 +111 @@
 }
 
+#define PS_ASSERT_INT_LESS_THAN(VAR1, VAR2, RVAL) \
+if (!(VAR1 < VAR2)) { \
+    psError(PS_ERR_UNKNOWN, true, \
+            "Error: %s is not less than %s (%d, %d)", #VAR1, #VAR2, VAR1, VAR2); \
+    return(RVAL); \
+}
+
+#define PS_ASSERT_INT_LESS_THAN_OR_EQUAL(VAR1, VAR2, RVAL) \
+if (!(VAR1 <= VAR2)) { \
+    psError(PS_ERR_UNKNOWN, true, \
+            "Error: %s is not less than %s (%d, %d)", #VAR1, #VAR2, VAR1, VAR2); \
+    return(RVAL); \
+}
+
 #define PS_ASSERT_INT_LARGER_THAN(NAME1, NAME2, RVAL) \
 if (!((NAME1) > (NAME2))) { \
@@ -337 +351 @@
 for (int my_i=0;my_i<(NAME)->n;my_i++) { \
     printf("%s->data.F32[%d] is %f\n", #NAME, my_i, (NAME)->data.F32[my_i]); \
+} \
+printf("\n"); \
+
+#define PS_VECTOR_PRINT_F64(NAME) \
+for (int my_i=0;my_i<(NAME)->n;my_i++) { \
+    printf("%s->data.F64[%d] is %f\n", #NAME, my_i, (NAME)->data.F64[my_i]); \
 } \
 printf("\n"); \
@@ -599 +619 @@
 }\
 
+#define PS_IMAGE_PRINT_F64(NAME) \
+printf("======== printing %s ========\n", #NAME); \
+for (int i = 0 ; i < (NAME)->numRows ; i++) { \
+    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
+        printf("%.2f ", (NAME)->data.F64[i][j]); \
+    } \
+    printf("\n"); \
+}\
+
 #define PS_IMAGE_SET_U8(NAME, VALUE) \
 for (int i = 0 ; i < (NAME)->numRows ; i++) { \

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 23:28:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -111 +111 @@
 }
 
+#define PS_ASSERT_INT_LESS_THAN(VAR1, VAR2, RVAL) \
+if (!(VAR1 < VAR2)) { \
+    psError(PS_ERR_UNKNOWN, true, \
+            "Error: %s is not less than %s (%d, %d)", #VAR1, #VAR2, VAR1, VAR2); \
+    return(RVAL); \
+}
+
+#define PS_ASSERT_INT_LESS_THAN_OR_EQUAL(VAR1, VAR2, RVAL) \
+if (!(VAR1 <= VAR2)) { \
+    psError(PS_ERR_UNKNOWN, true, \
+            "Error: %s is not less than %s (%d, %d)", #VAR1, #VAR2, VAR1, VAR2); \
+    return(RVAL); \
+}
+
 #define PS_ASSERT_INT_LARGER_THAN(NAME1, NAME2, RVAL) \
 if (!((NAME1) > (NAME2))) { \
@@ -337 +351 @@
 for (int my_i=0;my_i<(NAME)->n;my_i++) { \
     printf("%s->data.F32[%d] is %f\n", #NAME, my_i, (NAME)->data.F32[my_i]); \
+} \
+printf("\n"); \
+
+#define PS_VECTOR_PRINT_F64(NAME) \
+for (int my_i=0;my_i<(NAME)->n;my_i++) { \
+    printf("%s->data.F64[%d] is %f\n", #NAME, my_i, (NAME)->data.F64[my_i]); \
 } \
 printf("\n"); \
@@ -599 +619 @@
 }\
 
+#define PS_IMAGE_PRINT_F64(NAME) \
+printf("======== printing %s ========\n", #NAME); \
+for (int i = 0 ; i < (NAME)->numRows ; i++) { \
+    for (int j = 0 ; j < (NAME)->numCols ; j++) { \
+        printf("%.2f ", (NAME)->data.F64[i][j]); \
+    } \
+    printf("\n"); \
+}\
+
 #define PS_IMAGE_SET_U8(NAME, VALUE) \
 for (int i = 0 ; i < (NAME)->numRows ; i++) { \