obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Finished adding all the functions to directly set and get indices in

Browse Source 
columns containing indices referring to any type of data.
This commit is contained in:
Celine Mercier
2016-11-30 11:08:11 +01:00
parent 6f6099687d
commit 4ad8c16a73
4 changed files with 168 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/obidmscolumn_idx.c
View File

@ -24,27 +24,18 @@
**********************************************************************/
int obi_column_set_index(OBIDMS_column_p column, index_t line_nb, index_t value)
int obi_column_set_index_with_elt_idx(OBIDMS_column_p column, index_t line_nb, index_t element_idx, index_t value)
{
if (obi_column_prepare_to_set_value(column, line_nb) < 0)
return -1;
// Set the value
*(((index_t*) (column->data)) + line_nb) = value;
*(((index_t*) (column->data)) + (line_nb * ((column->header)->nb_elements_per_line)) + element_idx) = value;
return 0;
}
index_t obi_column_get_index(OBIDMS_column_p column, index_t line_nb)
{
if (obi_column_prepare_to_get_value(column, line_nb) < 0)
return OBIIdx_NA;
return *(((index_t*) (column->data)) + line_nb);
}
index_t obi_column_get_index_with_elt_idx(OBIDMS_column_p column, index_t line_nb, index_t element_idx)
{
if (obi_column_prepare_to_get_value(column, line_nb) < 0)
@ -54,6 +45,16 @@ index_t obi_column_get_index_with_elt_idx(OBIDMS_column_p column, index_t line_n
}
int obi_column_set_index_with_elt_name(OBIDMS_column_p column, index_t line_nb, const char* element_name, index_t value)
{
index_t element_idx = obi_column_get_element_index_from_name(column, element_name);
if (element_idx == OBIIdx_NA)
return -1;
return obi_column_set_index_with_elt_idx(column, line_nb, element_idx, value);
}
index_t obi_column_get_index_with_elt_name(OBIDMS_column_p column, index_t line_nb, const char* element_name)
{
index_t element_idx = obi_column_get_element_index_from_name(column, element_name);