[svn-r8488] Purpose:

Bug fix.

Description:
Fixed handling of trivial data transform expressions (like 5/3 + 3) and some
data coversion fixes.  Also added more tests to dtransform.c

Solution:
Added some more checks in the H5Z_xform_reduce_tree function to see if perhaps
the transform expression is complicated and is a non-trivial reduction.
Added tests for data conversion to dtransform as well as tests for a trivial
data transform expression.

Platforms tested:
h5committest'ed, except used arabica instead of sol and didn't do on copper
b/c no logon there. Problem noted with mtime test...doesn't appear to be
related to anything having to do with data transforms.

1 files changed, 125 insertions, 41 deletions

diff --git a/test/dtransform.c b/test/dtransform.c
index b3a0943..5e67986 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -2,18 +2,18 @@
 
 #define ROWS    12
 #define COLS    18
-#define TOL     2
 
-int compare(int* a, int* b);
+int compare_int(int* a, int* b, int tol);
+int compare_float(float* a, float* b, float tol);
 
 int main()
 {
-    
-    hid_t file_id, dxpl_id_f_to_c, dxpl_id_c_to_f, dset_id, datatype, dataspace;
+    hid_t file_id, dxpl_id_f_to_c, dxpl_id_c_to_f, dxpl_id_simple, dset_id_int, dset_id_float, datatype, dataspace;
     hsize_t dim[2] = {ROWS, COLS};
-    char* f_to_c = "(5/9.0)*(x-32)";
-    char* c_to_f = "(9/5.0)*x + 32";
-    int windchillF[ROWS][COLS] =
+    const char* f_to_c = "(5/9.0)*(x-32)";
+    const char* c_to_f = "(9/5.0)*x + 32";
+    const char* simple = "(4/2) * ( (2 + 4)/(5 - 2.5))"; /* this equals 4.8 */ 
+    int windchillFint[ROWS][COLS] =
     {   {36, 31, 25, 19, 13, 7, 1, -5, -11, -16, -22, -28, -34, -40, -46, -52, -57, -63 }, 
         {34, 27, 21, 15, 9, 3, -4, -10, -16, -22, -28, -35, -41, -47, -53, -59, -66, -72 } , 
         {32, 25, 19, 13, 6, 0, -7, -13, -19, -26, -32, -39, -45, -51, -58, -64, -71, -77 }, 
@@ -27,59 +27,135 @@ int main()
         {25, 18, 11, 4, -3, -11, -18, -25, -32, -39, -46, -54, -61, -68, -75, -82, -89, -97}, 
         {25, 17, 10, 3, -4, -11, -19, -26, -33, -40, -48, -55, -62, -69, -76, -84, -91, -98} 
     };
-    int windchillCread[ROWS][COLS];
-    int windchillFread[ROWS][COLS];
-    int windchillCcalc[ROWS][COLS];
+    int windchillFintread[ROWS][COLS];
+    float windchillFfloat[ROWS][COLS] = 
+    {   {36.0, 31.0, 25.0, 19.0, 13.0, 7.0, 1.0, -5.0, -11.0, -16.0, -22.0, -28.0, -34.0, -40.0, -46.0, -52.0, -57.0, -63.0 },
+	{34.0, 27.0, 21.0, 15.0, 9.0, 3.0, -4.0, -10.0, -16.0, -22.0, -28.0, -35.0, -41.0, -47.0, -53.0, -59.0, -66.0, -72.0 } ,  
+	{32.0, 25.0, 19.0, 13.0, 6.0, 0.0, -7.0, -13.0, -19.0, -26.0, -32.0, -39.0, -45.0, -51.0, -58.0, -64.0, -71.0, -77.0 },  
+	{30.0, 24.0, 17.0, 11.0, 4.0, -2.0, -9.0, -15.0, -22.0, -29.0, -35.0, -42.0, -48.0, -55.0, -61.0, -68.0, -74.0, -81.0 },  
+	{29.0, 23.0, 16.0, 9.0, 3.0, -4.0, -11.0, -17.0, -24.0, -31.0, -37.0, -44.0, -51.0, -58.0, -64.0, -71.0, -78.0, -84.0 },  
+	{28.0, 22.0, 15.0, 8.0, 1.0, -5.0, -12.0, -19.0, -26.0, -33.0, -39.0, -46.0, -53.0, -60.0, -67.0, -73.0, -80.0, -87.0 },  
+	{28.0, 21.0, 14.0, 7.0, 0.0, -7.0, -14.0, -21.0, -27.0, -34.0, -41.0, -48.0, -55.0, -62.0, -69.0, -76.0, -82.0, -89.0 },  
+	{27.0, 20.0, 13.0, 6.0, -1.0, -8.0, -15.0, -22.0, -29.0, -36.0, -43.0, -50.0, -57.0, -64.0, -71.0, -78.0, -84.0, -91.0 },  
+	{26.0, 19.0, 12.0, 5.0, -2.0, -9.0, -16.0, -23.0, -30.0, -37.0, -44.0, -51.0, -58.0, -65.0, -72.0, -79.0, -86.0, -93.0 },
+	{26.0, 19.0, 12.0, 4.0, -3.0, -10.0, -17.0, -24.0, -31.0, -38.0, -45.0, -52.0, -60.0, -67.0, -74.0, -81.0, -88.0, -95.0},
+	{25.0, 18.0, 11.0, 4.0, -3.0, -11.0, -18.0, -25.0, -32.0, -39.0, -46.0, -54.0, -61.0, -68.0, -75.0, -82.0, -89.0, -97.0},  
+	{25.0, 17.0, 10.0, 3.0, -4.0, -11.0, -19.0, -26.0, -33.0, -40.0, -48.0, -55.0, -62.0, -69.0, -76.0, -84.0, -91.0, -98.0} 
+    };
+    float windchillFfloatread[ROWS][COLS];
+    int windchillCint[ROWS][COLS];
     herr_t err;
     int row, col;
 
-
-    TESTING("data transform");
+    for(row = 0; row<ROWS; row++)
+    {
+	for(col = 0; col<COLS; col++)
+	    windchillCint[row][col] = (5/9.0)*(windchillFint[row][col] - 32);
+    }
     
     dxpl_id_f_to_c = H5Pcreate(H5P_DATASET_XFER);
     dxpl_id_c_to_f = H5Pcreate(H5P_DATASET_XFER);
-
+    dxpl_id_simple = H5Pcreate(H5P_DATASET_XFER);
+    
     err= H5Pset_data_transform(dxpl_id_f_to_c, f_to_c);
     err= H5Pset_data_transform(dxpl_id_c_to_f, c_to_f);
+    err = H5Pset_data_transform(dxpl_id_simple, simple);
 
 
     file_id = H5Fcreate("dtransform.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     dataspace = H5Screate_simple(2, dim, NULL); 
 
+    /* Write out the integer dataset to the file, converting it to c */
     datatype = H5Tcopy(H5T_NATIVE_INT);
+    dset_id_int = H5Dcreate(file_id, "/transformtest_int", datatype, dataspace, H5P_DEFAULT);
+    err = H5Dwrite(dset_id_int, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillFint);
+    H5Tclose(datatype);
+    
+    /* Write out a floating point version to the file, converting it to c */
+    datatype = H5Tcopy(H5T_NATIVE_FLOAT);
+    dset_id_float = H5Dcreate(file_id, "/transformtest_float", datatype, dataspace, H5P_DEFAULT);
+    err = H5Dwrite(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillFint);
+    H5Tclose(datatype);
 
-    dset_id = H5Dcreate(file_id, "/transformtest", datatype, dataspace, H5P_DEFAULT);
-
-    err = H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_f_to_c, windchillF);
-    err = H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, windchillCread);
+	    
 
-    for(row = 0; row<ROWS; row++)
-    {
-        for(col = 0; col<COLS; col++)
-            windchillCcalc[row][col] = (5/9.0)*(windchillF[row][col] - 32);
-    }
+    TESTING("data transform, no data type conversion (int->int)")
+    /* Read in the integer data with a data transform. */
+    err = H5Dread(dset_id_int, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillFintread);
     
-    if( (compare((int*)windchillCread, (int*)windchillCcalc)) == 0)
+    if( (compare_int(*windchillFintread, *windchillFint, 2)) == 0)
     {
         fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
         TEST_ERROR;
     }
     else
+	PASSED();
+
+    TESTING("data transform, no data type conversion (float->float)")
+    err = H5Dread(dset_id_float, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillFfloatread);
+    if( (compare_float(*windchillFfloat, *windchillFfloatread, 2.0)) == 0)
     {
-        err = H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillFread);
-        if( (compare((int *)windchillF, (int *)windchillFread)) == 0)
-        {
-            fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
-            TEST_ERROR;
-        }
-    } 
-    
+	fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
+	TEST_ERROR;
+    }
+    else
+      PASSED();
+
+   TESTING("data transform, with data type conversion (int->float)")
+    err = H5Dread(dset_id_int, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillFfloatread);
+    if( (compare_float(*windchillFfloat, *windchillFfloatread, 2.0)) == 0)
+         {   
+             fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
+        TEST_ERROR;
+    }
+    else
+       PASSED();
+
+   TESTING("data transform, with data type conversion (float->int)")
+    err = H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillFintread);
+    if( (compare_int(*windchillFint, *windchillFintread, 2)) == 0)
+         {   
+             fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
+        TEST_ERROR;
+    }
+    else
+       PASSED();
+
+    TESTING("data transform, trivial transform, without type conversion")
+    err = H5Dread(dset_id_float, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_simple, windchillFfloatread);
+    for(row = 0; row<ROWS; row++)
+    {
+	for(col = 0; col<COLS; col++)
+	{
+	    if((windchillFfloatread[row][col] - 4.8) > 0.0001)
+	    {
+		fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
+		TEST_ERROR;
+	    }
+	}
+    }
+    PASSED();
+
+    TESTING("data transform, trivial transform, with type conversion")
+    err = H5Dread(dset_id_float, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_simple, windchillFintread);
+    for(row = 0; row<ROWS; row++)
+    {
+	for(col = 0; col<COLS; col++)
+	{
+	    if(windchillFintread[row][col] != 4)
+	    {
+		fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
+		TEST_ERROR;
+	    }
+	}
+    }
+
 
     /* Close the objects we opened/created */
    err = H5Sclose(dataspace);
-   err = H5Tclose(datatype); 
-   err = H5Dclose(dset_id);
+   err = H5Dclose(dset_id_int);
+   err = H5Dclose(dset_id_float);
    err = H5Fclose(file_id);
    err = H5Pclose(dxpl_id_f_to_c);
    err = H5Pclose(dxpl_id_c_to_f);
@@ -92,19 +168,27 @@ error:
    return -1;
 }
 
-int compare(int* a, int* b)
+int compare_int(int* a, int* b, int tol)
 {
-    int row, col;
-    for(row = 0; row<ROWS; row++)
+    int i;
+    for(i=0; i<ROWS*COLS; i++)
     {
-        for(col = 0; col<COLS; col++)
-        {
-            if( !((a[row*COLS + col] <= (b[row*COLS + col] + TOL)) && (a[row*COLS + col] >= (b[row*COLS + col] - TOL))) )
-                return 0;
-        }
+	if( !((a[i] <= (b[i] + tol)) && (a[i] >= (b[i] - tol))))
+	    return 0;
     }
     return 1;
+   
 }
     
+int compare_float(float* a, float* b, float tol)
+{
+    int i;
+    for(i=0; i<ROWS*COLS; i++)
+    {
+	if( !((a[i] <= (b[i] + tol)) && (a[i] >= (b[i] - tol))) )
+	    return 0;
+    }
+    return 1;
+}