Skip to content

Commit

Permalink
change order of memory axes in dynamic 3-D memory allocation
Browse files Browse the repository at this point in the history
  • Loading branch information
Dejice Jacob committed Jul 4, 2017
1 parent 7f77254 commit f9b993e
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 30 deletions.
6 changes: 3 additions & 3 deletions src/add_vector/add_v_entry.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ int main( int argc , char *argv[] )

/* Display data */
debug("Data :") ;
for(idx_i=0 ; idx_i < meta.dim.dim_3d.dim_x ; idx_i++ ) {
printf("\n[x-%u] ", idx_i);
for(idx_i=0 ; idx_i < meta.dim.dim_3d.dim_z ; idx_i++ ) {
printf("\n[z-%u] ", idx_i);
for(idx_j=0 ; idx_j < meta.dim.dim_3d.dim_y ; idx_j++ ) {
printf("| <y-%u> ", idx_j);
for(idx_k=0 ; idx_k < meta.dim.dim_3d.dim_z ; idx_k++ )
for(idx_k=0 ; idx_k < meta.dim.dim_3d.dim_x ; idx_k++ )
printf("%d,", buff3D[idx_i][idx_j][idx_k] );
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/add_vector/add_v_options.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Option_Help g_help_strings[] =
{
{ .option = 'f', .option_text = "-f,--file...input data file. Each data point is line-separated" },
{ .option = 'd', .option_text = "-d,--dtype..data-types. Use (u)int8,(u)int16,(u)int32,(u)int64,float,double,longdouble" },
{ .option = 's', .option_text = "-s,--sep....Separator list. Separators should be in reverse order. [^:|] implies z->^,y->:,x->|"},
{ .option = 's', .option_text = "-s,--sep....Separator list. Separators should be in reverse order. [^:|] implies x->^,y->:,z->|"},
{ .option = 'h', .option_text = "-h,--help...this help menu" },
{ .option = 0 , .option_text = NULL },
};
Expand Down
53 changes: 27 additions & 26 deletions src/common/parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,11 +575,11 @@ static inline uint32_t _3D_sizeof_dim( Vector_MetaData *meta , uint32_t dim )
{
uint64_t dim_size = 0 ;
if((dim+1) == 1 )
dim_size = meta->dim.dim_3d.dim_x ;
dim_size = meta->dim.dim_3d.dim_z ;
else if((dim+1) == 2 )
dim_size = meta->dim.dim_3d.dim_y ;
else if((dim+1) == 3 )
dim_size = meta->dim.dim_3d.dim_z ;
dim_size = meta->dim.dim_3d.dim_x ;

return dim_size ;
}
Expand Down Expand Up @@ -768,27 +768,28 @@ static api_Err_Status _parse_data_3D( void ***buff, uint8_t *file_content , uint
goto err_3D_parse ;
}

sep_x[0] = sep_list[2]; /* Third delimiter is for dimension-x */
sep_x[0] = sep_list[0]; /* First delimiter is for dimension-x */
sep_y[0] = sep_list[1]; /* Second delimiter is for dimension-y */
sep_z[0] = sep_list[0]; /* First delimiter is for dimension-z */
sep_z[0] = sep_list[2]; /* Third delimiter is for dimension-z */

/* Parse files for data and convert */
for( dimx_ptr = strtok_r(file_content, sep_x, &save_x) , idx_i = 0 ;
dimx_ptr != NULL ; dimx_ptr = strtok_r(NULL, sep_x, &save_x), idx_i++) {
for( dimy_ptr = strtok_r(dimx_ptr, sep_y, &save_y) , idx_j = 0 ;
for( dimz_ptr = strtok_r(file_content, sep_z, &save_z) , idx_i = 0 ;
dimz_ptr != NULL ; dimz_ptr = strtok_r(NULL, sep_z, &save_z), idx_i++) {
for( dimy_ptr = strtok_r(dimz_ptr, sep_y, &save_y) , idx_j = 0 ;
dimy_ptr != NULL ; dimy_ptr = strtok_r(NULL, sep_y, &save_y) , idx_j++) {
for( dimz_ptr = strtok_r(dimy_ptr, sep_z, &save_z) , idx_k = 0 ;
dimz_ptr != NULL ; dimz_ptr = strtok_r(NULL, sep_z, &save_z) , idx_k++) {
for( dimx_ptr = strtok_r(dimy_ptr, sep_x, &save_x) , idx_k = 0 ;
dimx_ptr != NULL ; dimx_ptr = strtok_r(NULL, sep_x, &save_x) , idx_k++) {

err = _convert_to_number( dimz_ptr, meta, (void *)(**buff),
(idx_i * meta->dim.dim_3d.dim_y * meta->dim.dim_3d.dim_z) + (idx_j * meta->dim.dim_3d.dim_z) + idx_k );
err = _convert_to_number( dimx_ptr, meta, (void *)(**buff),
(idx_i * meta->dim.dim_3d.dim_y * meta->dim.dim_3d.dim_x) + (idx_j * meta->dim.dim_3d.dim_x) + idx_k );
if( err != api_Success ) {
debug("Error converting string to value. index = %u, err = %d", idx_i, err );
goto err_3D_parse ;
}
} /* for each item in dim-z */
} /* for each item in dim-x */
} /* for each item in dim-y */
} /* for each item in dim-x */
} /* for each item in dim-z */


err_3D_parse :
return err ;
Expand Down Expand Up @@ -1152,7 +1153,7 @@ static api_Err_Status _detect_3D_sizes( uint8_t *buff, uint8_t *sep_list, Vector


/*!
* First step - calculate number of items in dimension-Z
* First step - calculate number of items in dimension-X
*/
dimy_ptr = strchr( content, (int)sep_list[1] );
if( dimy_ptr == NULL ) {
Expand All @@ -1169,27 +1170,27 @@ static api_Err_Status _detect_3D_sizes( uint8_t *buff, uint8_t *sep_list, Vector
goto err_3D_item_detect ;
}

/* Count number of items in dimension-z */
sep[0] = sep_list[0]; /* 1st char -denotes z axis delimiter */
for( dimz_ptr = strtok_r(linebuff, sep, &ptr) ;
dimz_ptr != NULL ; dimz_ptr = strtok_r(NULL, sep, &ptr) )
meta->dim.dim_3d.dim_z++ ;
/* Count number of items in dimension-x */
sep[0] = sep_list[0]; /* 1st char -denotes x axis delimiter */
for( dimx_ptr = strtok_r(linebuff, sep, &ptr) ;
dimx_ptr != NULL ; dimx_ptr = strtok_r(NULL, sep, &ptr) )
meta->dim.dim_3d.dim_x++ ;

free(linebuff);
linebuff = NULL ;

/*!
* Second step - calculate number of items in dimension-Y
*/
dimx_ptr = strchr( content, (int)sep_list[2] );
if( dimx_ptr == NULL ) {
debug("Could not detect dimension-x-separator in 3-D data");
dimz_ptr = strchr( content, (int)sep_list[2] );
if( dimz_ptr == NULL ) {
debug("Could not detect dimension-z-separator in 3-D data");
err = api_Err_Memory ;
goto err_3D_item_detect ;
}


linebuff = strndup( content,(dimx_ptr - content));
linebuff = strndup( content,(dimz_ptr - content));
if( linebuff == NULL ) {
debug("Could not duplicate data buffer in RAM to count items");
err = api_Err_Memory ;
Expand All @@ -1205,11 +1206,11 @@ static api_Err_Status _detect_3D_sizes( uint8_t *buff, uint8_t *sep_list, Vector
free(linebuff);
linebuff = NULL ;

/* Count number of items in dim-x */
sep[0] = sep_list[2]; /* 3rd char -denotes dim-x delimiter */
/* Count number of items in dim-z */
sep[0] = sep_list[2]; /* 3rd char -denotes dim-z delimiter */
for( linebuff = strtok_r(content, sep, &ptr) ;
linebuff != NULL ; linebuff = strtok_r(NULL, sep, &ptr) )
meta->dim.dim_3d.dim_x++ ;
meta->dim.dim_3d.dim_z++ ;


err_3D_item_detect :
Expand Down

0 comments on commit f9b993e

Please sign in to comment.