Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(fix) H5Z_xform_create function and scientific notation #144

Merged
merged 2 commits into from
Dec 2, 2020
Merged

(fix) H5Z_xform_create function and scientific notation #144

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ad25df
(fix) H5Z_xform_create function and scientific notation
Nov 27, 2020
f67c9e1
(fix) H5Z_xform_create and scientific notation: Added test.
Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions src/H5Ztrans.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

#include "H5Zmodule.h" /* This source code file is part of the H5Z module */

#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5VMprivate.h" /* H5VM_array_fill */
#include "H5Zpkg.h" /* Data filters */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5VMprivate.h" /* H5VM_array_fill */
#include "H5Zpkg.h" /* Data filters */

/* Token types */
typedef enum {
Expand Down Expand Up @@ -994,12 +994,12 @@ H5Z__new_node(H5Z_token_type type)

/*-------------------------------------------------------------------------
* Function: H5Z_xform_eval
* Purpose: If the transform is trivial, this function applies it.
* Otherwise, it calls H5Z__xform_eval_full to do the full
* transform.
* Purpose: If the transform is trivial, this function applies it.
* Otherwise, it calls H5Z__xform_eval_full to do the full
* transform.
* Return: SUCCEED if transform applied successfully, FAIL otherwise
* Programmer: Leon Arber
* 5/1/04
* 5/1/04
*
*-------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1110,8 +1110,8 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size
/*-------------------------------------------------------------------------
* Function: H5Z__xform_eval_full
*
* Purpose: Does a full evaluation of the parse tree contained in tree
* and applies this transform to array.
* Purpose: Does a full evaluation of the parse tree contained in tree
* and applies this transform to array.
*
* Notes: In the case of a polynomial data transform (ie, the left and right
* subtree are both of type H5Z_XFORM_SYMBOL), the convention is
Expand All @@ -1121,7 +1121,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size
* Return: Nothing
*
* Programmer: Leon Arber
* 5/1/04
* 5/1/04
*
*-------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1539,10 +1539,22 @@ H5Z_xform_create(const char *expr)
"unable to allocate memory for data transform expression")

/* Find the number of times "x" is used in this equation, and allocate room for storing that many points
*
* Jan-Willem Blokland, 11 March 2020
* A more sophisticated check to support scientific notation.
*/
for (i = 0; i < HDstrlen(expr); i++)
if (HDisalpha(expr[i]))
for (i = 0; i < HDstrlen(expr); i++) {
if (HDisalpha(expr[i])) {
if ((i > 0) && (i < (HDstrlen(expr) - 1))) {
if (((expr[i] == 'E') || (expr[i] == 'e')) &&
(HDisdigit(expr[i - 1]) || (expr[i - 1] == '.')) &&
(HDisdigit(expr[i + 1]) || (expr[i + 1] == '-') || (expr[i + 1] == '+')))
continue;
}

count++;
}
}

/* When there are no "x"'s in the equation (ie, simple transform case),
* we don't need to allocate any space since no array will have to be
Expand Down Expand Up @@ -1753,7 +1765,7 @@ H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop)
* Function: H5Z_xform_extract_xform_str
*
* Purpose: Extracts the pointer to the data transform strings from the
* data transform property.`
* data transform property.`
* Return:
* Pointer to a copy of the string in the data_xform property.
*
Expand Down