core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1431: Cleanup

This commit is contained in:
Shahram Najm 2022-08-01 16:16:08 +01:00
parent 7ae3195552
commit fdcddc2352
2 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
tests/grib_ecc-1431.cpp
View File

@ -1,3 +1,13 @@
/*
* (C) Copyright 2005- ECMWF.
*
* This software is licensed under the terms of the Apache Licence Version 2.0
* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
*
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
#include "grib_api_internal.h" #include "grib_api_internal.h"
#include <eccodes.h> #include <eccodes.h>
#include <string.h> #include <string.h>
@ -11,30 +21,32 @@
typedef std::numeric_limits<double> dbl; typedef std::numeric_limits<double> dbl;
typedef std::numeric_limits<float> flt; typedef std::numeric_limits<float> flt;
struct Range { struct Range
{
double min; double min;
double max; double max;
}; };
/* //
* Test: This test doesn't accept errors after decompression. // Test: This test doesn't accept errors after decompression.
*/ //
void test_full() { void test_full()
{
std::vector<Range> ranges; std::vector<Range> ranges;
ranges.push_back({flt::max()/10 , flt::max() } ); ranges.push_back({ flt::max() / 10, flt::max() });
ranges.push_back({flt::max()/100 , flt::max()/10 } ); ranges.push_back({ flt::max() / 100, flt::max() / 10 });
ranges.push_back({1e+9 , 1e+10 } ); ranges.push_back({ 1e+9, 1e+10 });
ranges.push_back({1e+0 , 1e+1 } ); ranges.push_back({ 1e+0, 1e+1 });
ranges.push_back({1e-1 , 1e-0 } ); ranges.push_back({ 1e-1, 1e-0 });
ranges.push_back({1e-2 , 1e-1 } ); ranges.push_back({ 1e-2, 1e-1 });
ranges.push_back({1e-11 , 1e-10 } ); ranges.push_back({ 1e-11, 1e-10 });
/* TODO */ // TODO
/* The test fails for the following ranges */ // The test fails for the following ranges
/* These tests can be performed when the problem is solved with small values.*/ // These tests can be performed when the problem is solved with small values.
/* ranges.push_back({flt::min()*10 , flt::min()*100 } ); */ // ranges.push_back({flt::min()*10 , flt::min()*100 } );
/* ranges.push_back({flt::min() , flt::min()*10 } ); */ // ranges.push_back({flt::min() , flt::min()*10 } );
/* ranges.push_back({flt::min() , flt::max() } ); */ // ranges.push_back({flt::min() , flt::max() } );
std::vector<size_t> values_lens = { std::vector<size_t> values_lens = {
1, 1,
@ -48,37 +60,37 @@ void test_full() {
std::default_random_engine re; std::default_random_engine re;
size_t grid_simple_values_len = 0; size_t grid_simple_values_len = 0;
size_t grid_ccsds_values_len = 0; size_t grid_ccsds_values_len = 0;
std::string packing_type = ""; std::string packing_type = "";
size_t size = 0; size_t size = 0;
for (const size_t in_values_len: values_lens) { for (const size_t in_values_len : values_lens) {
for (const Range range: ranges) { for (const Range range : ranges) {
Assert(range.min < range.max); Assert(range.min < range.max);
std::cout << "Testing: " << in_values_len << " " << range.min << " " << range.max << std::endl; std::cout << "Testing: " << in_values_len << " " << range.min << " " << range.max << std::endl;
std::uniform_real_distribution<double> unif(range.min, range.max); std::uniform_real_distribution<double> unif(range.min, range.max);
codes_handle* handle = codes_grib_handle_new_from_samples(0, "reduced_gg_pl_128_grib2"); codes_handle* handle = codes_grib_handle_new_from_samples(0, "reduced_gg_pl_128_grib2");
double* in_values = new double[in_values_len]; double* in_values = new double[in_values_len];
double* grid_simple_values = new double[in_values_len]; double* grid_simple_values = new double[in_values_len];
double* grid_ccsds_values = new double[in_values_len]; double* grid_ccsds_values = new double[in_values_len];
grid_simple_values_len = in_values_len; grid_simple_values_len = in_values_len;
grid_ccsds_values_len = in_values_len; grid_ccsds_values_len = in_values_len;
/* Initialize with random values */ // Initialize with random values
for (size_t i = 0; i < in_values_len; ++i) { for (size_t i = 0; i < in_values_len; ++i) {
in_values[i] = unif(re); in_values[i] = unif(re);
} }
/* Convert original values to quantized values, by grid_simple */ // Convert original values to quantized values, by grid_simple
CODES_CHECK(codes_set_double_array(handle, "values", in_values, in_values_len), 0); CODES_CHECK(codes_set_double_array(handle, "values", in_values, in_values_len), 0);
CODES_CHECK(codes_get_double_array(handle, "values", grid_simple_values, &grid_simple_values_len), 0); CODES_CHECK(codes_get_double_array(handle, "values", grid_simple_values, &grid_simple_values_len), 0);
Assert(in_values_len == grid_simple_values_len); Assert(in_values_len == grid_simple_values_len);
/* Test grid_ccsds */ // Test grid_ccsds
packing_type = "grid_ccsds"; packing_type = "grid_ccsds";
size = packing_type.size(); size = packing_type.size();
CODES_CHECK(codes_set_string(handle, "packingType", packing_type.c_str(), &size), 0); CODES_CHECK(codes_set_string(handle, "packingType", packing_type.c_str(), &size), 0);
if ((err = codes_set_double_array(handle, "values", grid_simple_values, grid_simple_values_len)) != 0) { if ((err = codes_set_double_array(handle, "values", grid_simple_values, grid_simple_values_len)) != 0) {
Assert(!"CCSDS encoding failed"); Assert(!"CCSDS encoding failed");
@ -88,11 +100,11 @@ void test_full() {
} }
Assert(grid_ccsds_values_len == grid_simple_values_len); Assert(grid_ccsds_values_len == grid_simple_values_len);
/* Test buffers */ // Test buffers
for (size_t i = 0; i < grid_ccsds_values_len; ++i) { for (size_t i = 0; i < grid_ccsds_values_len; ++i) {
if (grid_ccsds_values[i] != grid_simple_values[i]) { if (grid_ccsds_values[i] != grid_simple_values[i]) {
std::cout.precision(dbl::max_digits10); std::cout.precision(dbl::max_digits10);
std::cout << "Test failed: " << grid_ccsds_values[i] << " != " << grid_simple_values[i] << std::endl; std::cout << "Test failed: " << grid_ccsds_values[i] << " != " << grid_simple_values[i] << std::endl;
Assert(0); Assert(0);
} }
} }
@ -107,24 +119,25 @@ void test_full() {
} }
/* //
* Test: This test accepts tolerates errors. Values after decompression must be within a certain user defined range. // Test: This test accepts tolerates errors. Values after decompression must be within a certain user defined range.
*/ //
void test_simplified() { void test_simplified()
{
std::vector<Range> ranges; std::vector<Range> ranges;
ranges.push_back({flt::max()/10 , flt::max() } ); ranges.push_back({ flt::max() / 10, flt::max() });
ranges.push_back({flt::max()/100 , flt::max()/10 } ); ranges.push_back({ flt::max() / 100, flt::max() / 10 });
ranges.push_back({1e+9 , 1e+10 } ); ranges.push_back({ 1e+9, 1e+10 });
ranges.push_back({1e+0 , 1e+1 } ); ranges.push_back({ 1e+0, 1e+1 });
ranges.push_back({1e-1 , 1e-0 } ); ranges.push_back({ 1e-1, 1e-0 });
ranges.push_back({1e-2 , 1e-1 } ); ranges.push_back({ 1e-2, 1e-1 });
ranges.push_back({1e-11 , 1e-10 } ); ranges.push_back({ 1e-11, 1e-10 });
/* TODO */ // TODO
/* The test fails for the following ranges */ // The test fails for the following ranges
/* These tests can be performed when the problem is solved with small values.*/ // These tests can be performed when the problem is solved with small values.
//ranges.push_back({flt::min()*10 , flt::min()*100 } ); // ranges.push_back({flt::min()*10 , flt::min()*100 } );
//ranges.push_back({flt::min() , flt::min()*10 } ); // ranges.push_back({flt::min() , flt::min()*10 } );
//ranges.push_back({flt::min() , flt::max() } ); // ranges.push_back({flt::min() , flt::max() } );
std::vector<size_t> values_lens = { std::vector<size_t> values_lens = {
1, 1,
@ -138,29 +151,29 @@ void test_simplified() {
std::default_random_engine re; std::default_random_engine re;
size_t grid_ccsds_values_len = 0; size_t grid_ccsds_values_len = 0;
std::string packing_type = ""; std::string packing_type = "";
size_t size = 0; size_t size = 0;
for (const size_t in_values_len: values_lens) { for (const size_t in_values_len : values_lens) {
for (const Range range: ranges) { for (const Range range : ranges) {
Assert(range.min < range.max); Assert(range.min < range.max);
std::cout << "Testing: " << in_values_len << " " << range.min << " " << range.max << std::endl; std::cout << "Testing: " << in_values_len << " " << range.min << " " << range.max << std::endl;
std::uniform_real_distribution<double> unif(range.min, range.max); std::uniform_real_distribution<double> unif(range.min, range.max);
codes_handle* handle = codes_grib_handle_new_from_samples(0, "reduced_gg_pl_128_grib2"); codes_handle* handle = codes_grib_handle_new_from_samples(0, "reduced_gg_pl_128_grib2");
double* in_values = new double[in_values_len]; double* in_values = new double[in_values_len];
double* grid_ccsds_values = new double[in_values_len]; double* grid_ccsds_values = new double[in_values_len];
grid_ccsds_values_len = in_values_len; grid_ccsds_values_len = in_values_len;
/* Initialize with random values */ // Initialize with random values
for (size_t i = 0; i < in_values_len; ++i) { for (size_t i = 0; i < in_values_len; ++i) {
in_values[i] = unif(re); in_values[i] = unif(re);
} }
/* Test grid_ccsds */ // Test grid_ccsds
packing_type = "grid_ccsds"; packing_type = "grid_ccsds";
size = packing_type.size(); size = packing_type.size();
CODES_CHECK(codes_set_string(handle, "packingType", packing_type.c_str(), &size), 0); CODES_CHECK(codes_set_string(handle, "packingType", packing_type.c_str(), &size), 0);
if ((err = codes_set_double_array(handle, "values", in_values, in_values_len)) != 0) { if ((err = codes_set_double_array(handle, "values", in_values, in_values_len)) != 0) {
Assert(!"CCSDS encoding failed"); Assert(!"CCSDS encoding failed");
@ -170,13 +183,13 @@ void test_simplified() {
} }
Assert(grid_ccsds_values_len == in_values_len); Assert(grid_ccsds_values_len == in_values_len);
/* Test buffers */ // Test buffers
double tolerance = 0.000001; double tolerance = 0.000001;
for (size_t i = 0; i < grid_ccsds_values_len; ++i) { for (size_t i = 0; i < grid_ccsds_values_len; ++i) {
if (!((grid_ccsds_values[i] < (in_values[i] * (1 + tolerance))) && if (!((grid_ccsds_values[i] < (in_values[i] * (1 + tolerance))) &&
grid_ccsds_values[i] > (in_values[i] / (1 + tolerance)))) { grid_ccsds_values[i] > (in_values[i] / (1 + tolerance)))) {
std::cout.precision(dbl::max_digits10); std::cout.precision(dbl::max_digits10);
std::cout << "Test failed: " << grid_ccsds_values[i] << " != " << in_values[i] << std::endl; std::cout << "Test failed: " << grid_ccsds_values[i] << " != " << in_values[i] << std::endl;
Assert(0); Assert(0);
} }
} }
@ -190,7 +203,8 @@ void test_simplified() {
} }
int main(int argc, char** argv) { int main(int argc, char** argv)
{
test_simplified(); test_simplified();
//test_full(); //test_full();
return 0; return 0;

5
tests/grib_ecc-1431.sh
View File

@ -9,9 +9,8 @@
# #
. ./include.ctest.sh . ./include.ctest.sh
set -u
REDIRECT=/dev/null label="grib_ecc-1431_test"
label="grib_ECC-1431_test" # Change prod to bufr or grib etc
temp=temp.$label temp=temp.$label
$EXEC $test_dir/grib_ecc-1431 $EXEC $test_dir/grib_ecc-1431