Changeset 7046

Timestamp:

May 2, 2006, 2:27:51 PM (20 years ago)

Author:

drobbin

Message:

Edited error message and updated indexSort test

Location:

trunk/psLib

Files:

• src/mathtypes/psVector.c (modified) (2 diffs)
• test/mathtypes/tst_psVectorSort_02.c (modified) (2 diffs)
• test/mathtypes/verified/tst_psVectorSort_01.stderr (modified) (1 diff)

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-02 23:02:29 $
+*  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-03 00:27:51 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -237 +237 @@
                 char* typeStr;
                 PS_TYPE_NAME(typeStr,type);
-                psError(PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, typeStr);
+                psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                        //                        PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, typeStr);
+                        "Input psVector is an unsupported type.\n");
                 psFree(output);
                 return NULL;

trunk/psLib/test/mathtypes/tst_psVectorSort_02.c

@@ -14 +14 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-05-02 22:35:52 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-05-03 00:27:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 in->data.datatype[4] = 5+value; \
 out = psVectorSortIndex(out,in); \
-if(out->type.type != PS_TYPE_U32) { \
+if(out->type.type != PS_TYPE_S32) { \
     psError(PS_ERR_UNKNOWN,true,"Output vector is not of type PS_TYPE_U32"); \
     return 1; \

trunk/psLib/test/mathtypes/verified/tst_psVectorSort_01.stderr

@@ -2 +2 @@
     Following should generate an error messgae
 <DATE><TIME>|<HOST>|E|psVectorCopy (FILE:LINENO)
-    Input psVector is an unsupported type (0xaacd184f).
+    Input psVector is an unsupported type.
 <DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     Error in psVectorSort:  psVectorCopy returned NULL vector!