Changeset 5114 for trunk/psLib/src/mathtypes

Timestamp:

Sep 23, 2005, 2:17:44 PM (21 years ago)

Author:

drobbin

Message:

Updated, fixed, and added error tests to the Set/Get functions & tests

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (4 diffs)
• psVector.c (modified) (4 diffs)
• psVector.h (modified) (2 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-23 00:04:36 $
+ *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-24 00:17:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -272 +272 @@
                 complex value)
 {
-    if (image == NULL)
+    if (image == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL);
         return false;
-    if (x >= image->numRows || y >= image->numCols)
+    }
+    if (x >= image->numRows || y >= image->numCols) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Position too large\n");
         return false;
+    }
+
     if(x < 0)
         x += image->numRows;
+    if(x < 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid x.  Negative number too large\n");
+        return false;
+    }
+
     if(y < 0)
         y += image->numCols;
+    if(y < 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid y.  Negative number too large\n");
+        return false;
+    }
 
     switch (image->type.type) {
@@ -330 +344 @@
                    int y)
 {
-    if (image == NULL)
+    if (image == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL);
         return NAN;
-    if (x >= image->numRows || y >= image->numCols)
+    }
+    if (x >= image->numRows || y >= image->numCols) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Position too large\n");
         return NAN;
+    }
+
     if(x < 0)
         x += image->numRows;
+    if(x < 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid x.  Negative number too large\n");
+        return NAN;
+    }
+
     if(y < 0)
         y += image->numCols;
+    if(y < 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid y.  Negative number too large\n");
+        return NAN;
+    }
 
     switch (image->type.type) {
@@ -377 +405 @@
         break;
     default:
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Invalid psImage Data Type\n");
         return NAN;
     }

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-23 00:04:36 $
+*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-24 00:17:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -817 +817 @@
                  complex value)
 {
-    if (input == NULL)
+    if (input == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_NULL);
         return false;
-    if (position >= input->n)
+    }
+    if (position > input->n) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Number too large\n");
         return false;
-    if(position < 0)
+    }
+    if (position < 0)
         position += input->n;
+    if (position < 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Negative number too large\n");
+        return false;
+    }
+
+    if (position == input->n) {
+        if (position >= input->nalloc) {
+            psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                    "Specified position, %ld, is greater than n+1 of the vector, %ld.",
+                    position, input->nalloc);
+            return false;
+        }
+        (*(psVector**)&input)->n++;
+    }
 
     switch (input->type.type) {
@@ -872 +890 @@
                     long position)
 {
-    if (input == NULL)
+    if (input == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_NULL);
         return NAN;
+    }
     if (position >= input->n) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Number too large\n");
         return NAN;
     }
     if(position < 0)
         position += input->n;
-
+    if (position < 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Negative number too large\n");
+        return NAN;
+    }
     switch (input->type.type) {
     case PS_TYPE_U8:
@@ -918 +942 @@
         break;
     default:
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Invalid psVector Data Type\n");
         return NAN;
     }

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-22 02:32:00 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-24 00:17:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 typedef struct
 {
-    psMathType type;                       ///< Type of data.
+    psMathType type;                   ///< Type of data.
     long n;                            ///< Number of elements in use.
     const long nalloc;                 ///< Total number of elements available.