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

The cython function to open a column is now a method of the OBIDMS class

Browse Source
This commit is contained in:
Celine Mercier
2015-09-17 11:23:50 +02:00
parent 2698022aaf
commit 34a3717fb9
3 changed files with 109 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
python/obitools3/obidms/capidms.pyx
View File

@ -4,6 +4,12 @@ from pathlib import Path
from .capidms cimport * from .capidms cimport *
from obitools3.obidms.obidmscolumn.obidmscolumn_int.capidmscolumn_int import *
from obitools3.obidms.obidmscolumn.obidmscolumn_float.capidmscolumn_float import *
from obitools3.obidms.obidmscolumn.obidmscolumn_bool.capidmscolumn_bool import *
from obitools3.obidms.obidmscolumn.obidmscolumn_char.capidmscolumn_char import *
from obitools3.obidms.obidmscolumn.obidmscolumn_idx.capidmscolumn_idx import *
cdef class OBIDMS : cdef class OBIDMS :
@ -32,3 +38,82 @@ cdef class OBIDMS :
#dms[column_name]['line_count'] = line_count #dms[column_name]['line_count'] = line_count
print("{:<25} {:<25} {:<25} {:<25}".format(column_name, data_type, latest_version, line_count)) print("{:<25} {:<25} {:<25} {:<25}".format(column_name, data_type, latest_version, line_count))
def open_column(self,
column_name,
bint create=False,
bint clone=False, bint clone_data=True,
obiversion_t version_number=-1,
type=0,
size_t nb_lines=0,
size_t nb_elements_per_line=1,
str elements_names=None):
column_name_b = column_name.encode(encoding='UTF-8')
if not type :
if create :
print("A data type must be specified")
else :
type = obi_column_get_data_type_from_name(self.pointer, column_name_b)
if type == 1 :
if (create or clone) :
column = OBIDMS_column_int_writable(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_int_read(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
elif type == 2 :
if (create or clone) :
column = OBIDMS_column_float_writable(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_float_read(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
elif type == 3 :
if (create or clone) :
column = OBIDMS_column_bool_writable(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_bool_read(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
elif type == 4 :
if (create or clone) :
column = OBIDMS_column_char_writable(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_char_read(self, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
raise Exception("Problem with the data type")
return column

4
python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd
View File

@ -12,7 +12,7 @@ cdef extern from "obitypes.h" nogil:
ctypedef OBIBool obibool_t ctypedef OBIBool obibool_t
ctypedef int32_t obiint_t ctypedef int32_t obiint_t
ctypedef double obifloat_t ctypedef double obifloat_t
ctypedef char obichar_t ctypedef bytes obichar_t
ctypedef size_t obiidx_t ctypedef size_t obiidx_t
char* name_data_type(int data_type) char* name_data_type(int data_type)
@ -42,7 +42,7 @@ cdef extern from "obidmscolumn.h" nogil:
cdef class OBIDMS_column: cdef class OBIDMS_column:
cdef OBIDMS_column_p pointer cdef OBIDMS_column_p pointer
cdef OBIDMS_p dms cdef OBIDMS dms
cdef str data_type # keep as OBIType_t? both? cdef str data_type # keep as OBIType_t? both?
cdef str dms_name cdef str dms_name
cdef str column_name cdef str column_name

123
python/obitools3/obidms/obidmscolumn/capidmscolumn.pyx
View File

@ -1,41 +1,38 @@
#cython: language_level=3 #cython: language_level=3
from .capidmscolumn cimport * from .capidmscolumn cimport *
from obitools3.obidms.obidmscolumn.obidmscolumn_int.capidmscolumn_int import *
from obitools3.obidms.obidmscolumn.obidmscolumn_float.capidmscolumn_float import *
from obitools3.obidms.obidmscolumn.obidmscolumn_bool.capidmscolumn_bool import *
from obitools3.obidms.obidmscolumn.obidmscolumn_char.capidmscolumn_char import *
from obitools3.obidms.obidmscolumn.obidmscolumn_idx.capidmscolumn_idx import *
cdef class OBIDMS_column: cdef class OBIDMS_column:
#Should only be initialized through a subclass (or open()) #Should only be initialized through a subclass
def __init__(self, dms_name, column_name, def __init__(self,
create, clone, clone_data, OBIDMS dms,
version_number, type, column_name,
nb_lines, nb_elements_per_line, bint create,
elements_names): bint clone, bint clone_data,
column_name_b = column_name.encode(encoding='UTF-8') obiversion_t version_number,
dms_name_b = dms_name.encode(encoding='UTF-8') OBIType_t type,
self.dms_name = dms_name size_t nb_lines,
self.column_name = column_name size_t nb_elements_per_line,
str elements_names):
self.dms = dms
self.data_type = (name_data_type(type)).decode('UTF-8') self.data_type = (name_data_type(type)).decode('UTF-8')
self.column_name = column_name
column_name_b = column_name.encode(encoding='UTF-8')
dms_name_b = self.dms.dms_name.encode(encoding='UTF-8')
if create : if create :
dms = obi_dms(dms_name_b)
self.dms = dms
if elements_names == None : if elements_names == None :
elements_names_b = column_name_b elements_names_b = column_name_b
else : else :
elements_names_b = elements_names.encode(encoding='UTF-8') elements_names_b = elements_names.encode(encoding='UTF-8')
self.pointer = obi_create_column(self.dms, column_name_b, type, nb_lines, nb_elements_per_line, elements_names_b) self.pointer = obi_create_column(self.dms.pointer, column_name_b, type, nb_lines, nb_elements_per_line, elements_names_b)
else : else :
dms = obi_open_dms(dms_name_b)
self.dms = dms
if clone : if clone :
self.pointer = obi_clone_column(self.dms, column_name_b, version_number, clone_data) self.pointer = obi_clone_column(self.dms.pointer, column_name_b, version_number, clone_data)
else : else :
self.pointer = obi_open_column(self.dms, column_name_b, version_number) self.pointer = obi_open_column(self.dms.pointer, column_name_b, version_number)
def __iter__(self): def __iter__(self):
elements_names = self.get_elements_names() elements_names = self.get_elements_names()
@ -53,10 +50,10 @@ cdef class OBIDMS_column:
line = self.get_item(line_nb, element_name) line = self.get_item(line_nb, element_name)
yield line yield line
def __setitem__(self, line_nb, value): def __setitem__(self, int line_nb, value):
self.set_item(line_nb, "", value) self.set_item(line_nb, "", value)
def __getitem__(self, line_nb): def __getitem__(self, int line_nb):
return self.get_item(line_nb, "") return self.get_item(line_nb, "")
def get_elements_names(self): def get_elements_names(self):
@ -69,84 +66,6 @@ cdef class OBIDMS_column:
def get_nb_lines_used(self): def get_nb_lines_used(self):
return obi_column_get_nb_lines_used(self.pointer) return obi_column_get_nb_lines_used(self.pointer)
@staticmethod
def open(dms_name, column_name,
create=False, clone=False, clone_data=True,
version_number=-1, type=None,
nb_lines=None, nb_elements_per_line=1,
elements_names=None):
column_name_b = column_name.encode(encoding='UTF-8')
dms_name_b = dms_name.encode(encoding='UTF-8')
dms = obi_dms(dms_name_b)
if type is None :
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 :
if (create or clone) :
column = OBIDMS_column_int_writable(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_int_read(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
elif type == 2 :
if (create or clone) :
column = OBIDMS_column_float_writable(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_float_read(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
elif type == 3 :
if (create or clone) :
column = OBIDMS_column_bool_writable(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_bool_read(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
elif type == 4 :
if (create or clone) :
column = OBIDMS_column_char_writable(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
column = OBIDMS_column_char_read(dms_name, column_name,
create, clone, clone_data,
version_number, type,
nb_lines, nb_elements_per_line,
elements_names)
else :
"Problem with the data type"
return column