Changeset 4366

Timestamp:

Jun 22, 2005, 5:19:29 PM (21 years ago)

Author:

desonia

Message:

modified psLookupTableRead to take a long indexCol and added check for
an invalidly large indexCol for psLookupTableImport.

Location:

trunk/psLib

Files:

• src/dataIO/psLookupTable.c (modified) (3 diffs)
• src/dataIO/psLookupTable.h (modified) (3 diffs)
• src/types/psLookupTable.c (modified) (3 diffs)
• src/types/psLookupTable.h (modified) (3 diffs)
• test/dataIO/tst_psLookupTable_01.c (modified) (2 diffs)

trunk/psLib/src/dataIO/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-20 22:42:29 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-23 03:19:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -548 +548 @@
 }
 
-psLookupTable *psLookupTableImport(psLookupTable *table, const psArray *vectors, int indexCol)
+psLookupTable *psLookupTableImport(psLookupTable *table, const psArray *vectors, long indexCol)
 {
     psLookupTable* outputTable = NULL;
@@ -564 +564 @@
     if(indexCol < 0 ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column cannot be less than zero");
+        return NULL;
+    }
+
+    if (indexCol >= vectors->n) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column, %d, is larger than number of columns, %d.",
+                indexCol, vectors->n);
         return NULL;
     }

trunk/psLib/src/dataIO/psLookupTable.h

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-20 22:42:29 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-23 03:19:29 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
     const char *filename;              ///< Name of file with table
     const char *format;                ///< scanf-like format string for file
-    unsigned int indexCol;             ///< Column of the index vector (starting at zero)
+    long indexCol;                     ///< Column of the index vector (starting at zero)
     psVector *index;                   ///< Vector of independent index values
     psArray *values;                   ///< Array of dependent table values corresponding to index values
@@ -91 +91 @@
  */
 psLookupTable *psLookupTableImport(
-    psLookupTable *table,            ///< Lookup table into which to import
-    const psArray *vectors,          ///< Array of vectors
-    int indexCol                     ///< Index of the index vector in the array of vectors
+    psLookupTable *table,              ///< Lookup table into which to import
+    const psArray *vectors,            ///< Array of vectors
+    long indexCol                      ///< Index of the index vector in the array of vectors
 );
 

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-20 22:42:29 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-23 03:19:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -548 +548 @@
 }
 
-psLookupTable *psLookupTableImport(psLookupTable *table, const psArray *vectors, int indexCol)
+psLookupTable *psLookupTableImport(psLookupTable *table, const psArray *vectors, long indexCol)
 {
     psLookupTable* outputTable = NULL;
@@ -564 +564 @@
     if(indexCol < 0 ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column cannot be less than zero");
+        return NULL;
+    }
+
+    if (indexCol >= vectors->n) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column, %d, is larger than number of columns, %d.",
+                indexCol, vectors->n);
         return NULL;
     }

trunk/psLib/src/types/psLookupTable.h

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-20 22:42:29 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-23 03:19:29 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
     const char *filename;              ///< Name of file with table
     const char *format;                ///< scanf-like format string for file
-    unsigned int indexCol;             ///< Column of the index vector (starting at zero)
+    long indexCol;                     ///< Column of the index vector (starting at zero)
     psVector *index;                   ///< Vector of independent index values
     psArray *values;                   ///< Array of dependent table values corresponding to index values
@@ -91 +91 @@
  */
 psLookupTable *psLookupTableImport(
-    psLookupTable *table,            ///< Lookup table into which to import
-    const psArray *vectors,          ///< Array of vectors
-    int indexCol                     ///< Index of the index vector in the array of vectors
+    psLookupTable *table,              ///< Lookup table into which to import
+    const psArray *vectors,            ///< Array of vectors
+    long indexCol                      ///< Index of the index vector in the array of vectors
 );
 

trunk/psLib/test/dataIO/tst_psLookupTable_01.c

@@ -12 +12 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-05-31 21:52:49 $
+*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-06-23 03:19:29 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
@@ -621 +621 @@
 {
     psLookupTable*  table1  = NULL;
-    psS32           numRows = 0;
+    long           numRows = 0;
 
     // Attempt to read table with NULL input table specified