[svn-r12984]

Added a relative error formula to deal with floating point uncertainty
in the comparison of floats and double types. 
Added new tests for this feature to the file generator program and to
the shell script

1 files changed, 64 insertions, 64 deletions

diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index 9d87639..7a85488 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -205,77 +205,77 @@ Dataset:     </g1/compound> and </g1/compound>
 position        compound        compound        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
-[ 0 ]          2.000000        0.000000        2.000000       
+[ 0 ]          2               0               2              
 [ 1 ]          3               0               3              
-[ 1 ]          4.000000        0.000000        4.000000       
+[ 1 ]          4               0               4              
 4 differences found
 Dataset:     </g1/compound2D> and </g1/compound2D>
 position        compound2D      compound2D      difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
-[ 0 0 ]          2.000000        0.000000        2.000000       
+[ 0 0 ]          2               0               2              
 [ 0 1 ]          3               0               3              
-[ 0 1 ]          4.000000        0.000000        4.000000       
+[ 0 1 ]          4               0               4              
 [ 1 0 ]          5               0               5              
-[ 1 0 ]          6.000000        0.000000        6.000000       
+[ 1 0 ]          6               0               6              
 [ 1 1 ]          7               0               7              
-[ 1 1 ]          8.000000        0.000000        8.000000       
+[ 1 1 ]          8               0               8              
 [ 2 0 ]          9               0               9              
-[ 2 0 ]          10.000000       0.000000        10.000000      
+[ 2 0 ]          10              0               10             
 [ 2 1 ]          11              0               11             
-[ 2 1 ]          12.000000       0.000000        12.000000      
+[ 2 1 ]          12              0               12             
 12 differences found
 Dataset:     </g1/compound3D> and </g1/compound3D>
 position        compound3D      compound3D      difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
-[ 0 0 0 ]          2.000000        0.000000        2.000000       
+[ 0 0 0 ]          2               0               2              
 [ 0 0 1 ]          3               0               3              
-[ 0 0 1 ]          4.000000        0.000000        4.000000       
+[ 0 0 1 ]          4               0               4              
 [ 0 1 0 ]          5               0               5              
-[ 0 1 0 ]          6.000000        0.000000        6.000000       
+[ 0 1 0 ]          6               0               6              
 [ 0 1 1 ]          7               0               7              
-[ 0 1 1 ]          8.000000        0.000000        8.000000       
+[ 0 1 1 ]          8               0               8              
 [ 0 2 0 ]          9               0               9              
-[ 0 2 0 ]          10.000000       0.000000        10.000000      
+[ 0 2 0 ]          10              0               10             
 [ 0 2 1 ]          11              0               11             
-[ 0 2 1 ]          12.000000       0.000000        12.000000      
+[ 0 2 1 ]          12              0               12             
 [ 1 0 0 ]          13              0               13             
-[ 1 0 0 ]          14.000000       0.000000        14.000000      
+[ 1 0 0 ]          14              0               14             
 [ 1 0 1 ]          15              0               15             
-[ 1 0 1 ]          16.000000       0.000000        16.000000      
+[ 1 0 1 ]          16              0               16             
 [ 1 1 0 ]          17              0               17             
-[ 1 1 0 ]          18.000000       0.000000        18.000000      
+[ 1 1 0 ]          18              0               18             
 [ 1 1 1 ]          19              0               19             
-[ 1 1 1 ]          20.000000       0.000000        20.000000      
+[ 1 1 1 ]          20              0               20             
 [ 1 2 0 ]          21              0               21             
-[ 1 2 0 ]          22.000000       0.000000        22.000000      
+[ 1 2 0 ]          22              0               22             
 [ 1 2 1 ]          23              0               23             
-[ 1 2 1 ]          24.000000       0.000000        24.000000      
+[ 1 2 1 ]          24              0               24             
 [ 2 0 0 ]          25              0               25             
-[ 2 0 0 ]          26.000000       0.000000        26.000000      
+[ 2 0 0 ]          26              0               26             
 [ 2 0 1 ]          27              0               27             
-[ 2 0 1 ]          28.000000       0.000000        28.000000      
+[ 2 0 1 ]          28              0               28             
 [ 2 1 0 ]          29              0               29             
-[ 2 1 0 ]          30.000000       0.000000        30.000000      
+[ 2 1 0 ]          30              0               30             
 [ 2 1 1 ]          31              0               31             
-[ 2 1 1 ]          32.000000       0.000000        32.000000      
+[ 2 1 1 ]          32              0               32             
 [ 2 2 0 ]          33              0               33             
-[ 2 2 0 ]          34.000000       0.000000        34.000000      
+[ 2 2 0 ]          34              0               34             
 [ 2 2 1 ]          35              0               35             
-[ 2 2 1 ]          36.000000       0.000000        36.000000      
+[ 2 2 1 ]          36              0               36             
 [ 3 0 0 ]          37              0               37             
-[ 3 0 0 ]          38.000000       0.000000        38.000000      
+[ 3 0 0 ]          38              0               38             
 [ 3 0 1 ]          39              0               39             
-[ 3 0 1 ]          40.000000       0.000000        40.000000      
+[ 3 0 1 ]          40              0               40             
 [ 3 1 0 ]          41              0               41             
-[ 3 1 0 ]          42.000000       0.000000        42.000000      
+[ 3 1 0 ]          42              0               42             
 [ 3 1 1 ]          43              0               43             
-[ 3 1 1 ]          44.000000       0.000000        44.000000      
+[ 3 1 1 ]          44              0               44             
 [ 3 2 0 ]          45              0               45             
-[ 3 2 0 ]          46.000000       0.000000        46.000000      
+[ 3 2 0 ]          46              0               46             
 [ 3 2 1 ]          47              0               47             
-[ 3 2 1 ]          48.000000       0.000000        48.000000      
+[ 3 2 1 ]          48              0               48             
 48 differences found
 Dataset:     </g1/enum> and </g1/enum>
 position        enum            enum            difference          
@@ -291,46 +291,46 @@ Dataset:     </g1/enum3D> and </g1/enum3D>
 Dataset:     </g1/float> and </g1/float>
 position        float           float           difference          
 ------------------------------------------------------------
-[ 0 ]          1.000000        0.000000        1.000000       
-[ 1 ]          2.000000        0.000000        2.000000       
+[ 0 ]          1               0               1              
+[ 1 ]          2               0               2              
 2 differences found
 Dataset:     </g1/float2D> and </g1/float2D>
 position        float2D         float2D         difference          
 ------------------------------------------------------------
-[ 0 0 ]          1.000000        0.000000        1.000000       
-[ 0 1 ]          2.000000        0.000000        2.000000       
-[ 1 0 ]          3.000000        0.000000        3.000000       
-[ 1 1 ]          4.000000        0.000000        4.000000       
-[ 2 0 ]          5.000000        0.000000        5.000000       
-[ 2 1 ]          6.000000        0.000000        6.000000       
+[ 0 0 ]          1               0               1              
+[ 0 1 ]          2               0               2              
+[ 1 0 ]          3               0               3              
+[ 1 1 ]          4               0               4              
+[ 2 0 ]          5               0               5              
+[ 2 1 ]          6               0               6              
 6 differences found
 Dataset:     </g1/float3D> and </g1/float3D>
 position        float3D         float3D         difference          
 ------------------------------------------------------------
-[ 0 0 0 ]          1.000000        0.000000        1.000000       
-[ 0 0 1 ]          2.000000        0.000000        2.000000       
-[ 0 1 0 ]          3.000000        0.000000        3.000000       
-[ 0 1 1 ]          4.000000        0.000000        4.000000       
-[ 0 2 0 ]          5.000000        0.000000        5.000000       
-[ 0 2 1 ]          6.000000        0.000000        6.000000       
-[ 1 0 0 ]          7.000000        0.000000        7.000000       
-[ 1 0 1 ]          8.000000        0.000000        8.000000       
-[ 1 1 0 ]          9.000000        0.000000        9.000000       
-[ 1 1 1 ]          10.000000       0.000000        10.000000      
-[ 1 2 0 ]          11.000000       0.000000        11.000000      
-[ 1 2 1 ]          12.000000       0.000000        12.000000      
-[ 2 0 0 ]          13.000000       0.000000        13.000000      
-[ 2 0 1 ]          14.000000       0.000000        14.000000      
-[ 2 1 0 ]          15.000000       0.000000        15.000000      
-[ 2 1 1 ]          16.000000       0.000000        16.000000      
-[ 2 2 0 ]          17.000000       0.000000        17.000000      
-[ 2 2 1 ]          18.000000       0.000000        18.000000      
-[ 3 0 0 ]          19.000000       0.000000        19.000000      
-[ 3 0 1 ]          20.000000       0.000000        20.000000      
-[ 3 1 0 ]          21.000000       0.000000        21.000000      
-[ 3 1 1 ]          22.000000       0.000000        22.000000      
-[ 3 2 0 ]          23.000000       0.000000        23.000000      
-[ 3 2 1 ]          24.000000       0.000000        24.000000      
+[ 0 0 0 ]          1               0               1              
+[ 0 0 1 ]          2               0               2              
+[ 0 1 0 ]          3               0               3              
+[ 0 1 1 ]          4               0               4              
+[ 0 2 0 ]          5               0               5              
+[ 0 2 1 ]          6               0               6              
+[ 1 0 0 ]          7               0               7              
+[ 1 0 1 ]          8               0               8              
+[ 1 1 0 ]          9               0               9              
+[ 1 1 1 ]          10              0               10             
+[ 1 2 0 ]          11              0               11             
+[ 1 2 1 ]          12              0               12             
+[ 2 0 0 ]          13              0               13             
+[ 2 0 1 ]          14              0               14             
+[ 2 1 0 ]          15              0               15             
+[ 2 1 1 ]          16              0               16             
+[ 2 2 0 ]          17              0               17             
+[ 2 2 1 ]          18              0               18             
+[ 3 0 0 ]          19              0               19             
+[ 3 0 1 ]          20              0               20             
+[ 3 1 0 ]          21              0               21             
+[ 3 1 1 ]          22              0               22             
+[ 3 2 0 ]          23              0               23             
+[ 3 2 1 ]          24              0               24             
 24 differences found
 Dataset:     </g1/integer> and </g1/integer>
 position        integer         integer         difference