Functions and files for OBIDMS columns with the type OBI_FLOAT

This commit is contained in:
celinemercier
2015-08-10 16:04:53 +02:00
parent 66f397239b
commit d53c16cf3e
7 changed files with 163 additions and 1 deletions

View File

@ -2,6 +2,7 @@
from .capidmscolumn cimport *
from obitools3.obidms.obidmscolumn.obidmscolumn_int.capidmscolumn_int import OBIDMS_column_int
from obitools3.obidms.obidmscolumn.obidmscolumn_float.capidmscolumn_float import OBIDMS_column_float
cdef class OBIDMS_column:
@ -83,7 +84,10 @@ cdef class OBIDMS_column:
dms = obi_dms(dms_name_b)
if type is None :
type = obi_column_get_data_type_from_name(dms, column_name_b)
if create :
print("A data type must be specified")
else :
type = obi_column_get_data_type_from_name(dms, column_name_b)
if type == 1 :
column = OBIDMS_column_int(dms_name, column_name,
@ -91,6 +95,12 @@ cdef class OBIDMS_column:
type, nb_elements,
nb_elements_per_line, elements_names)
elif type == 2 :
column = OBIDMS_column_float(dms_name, column_name,
create, version_number,
type, nb_elements,
nb_elements_per_line, elements_names)
else :
"Problem with the data type"

View File

@ -0,0 +1,16 @@
../../../../../src/obidmscolumn_float.c
../../../../../src/obidmscolumn_float.h
../../../../../src/obidmscolumn.h
../../../../../src/obidmscolumn.c
../../../../../src/obidmscolumndir.h
../../../../../src/obidmscolumndir.c
../../../../../src/obidms.h
../../../../../src/obidms.c
../../../../../src/obierrno.h
../../../../../src/obierrno.c
../../../../../src/obilittlebigman.h
../../../../../src/obilittlebigman.c
../../../../../src/obitypes.h
../../../../../src/obitypes.c
../../../../../src/private_at_functions.h
../../../../../src/private_at_functions.c

View File

@ -0,0 +1,7 @@
from obitools3.obidms.obidmscolumn.capidmscolumn cimport *
cdef extern from "obidmscolumn_float.h" nogil:
int obi_column_set_float(OBIDMS_column_p column, size_t line_nb, size_t element_idx, obifloat_t value)
obifloat_t obi_column_get_float(OBIDMS_column_p column, size_t line_nb, size_t element_idx)

View File

@ -0,0 +1,30 @@
#cython: language_level=3
from .capidmscolumn_float cimport *
cdef class OBIDMS_column_float(OBIDMS_column) :
def set_item(self, line_nb, element_name, value):
if element_name != "" :
element_idx = self.get_element_index_from_name(element_name)
else :
if obi_column_get_nb_elements_per_line(self.pointer) == 1 :
element_idx = 0
else :
print("An element name must be specified")
return -1
return obi_column_set_float(self.pointer, line_nb, element_idx, value)
def get_item(self, line_nb, element_name):
if element_name != "" :
element_idx = self.get_element_index_from_name(element_name)
else :
if obi_column_get_nb_elements_per_line(self.pointer) == 1 :
element_idx = 0
else :
print("An element name must be specified")
return -1
return obi_column_get_float(self.pointer, line_nb, element_idx)