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

DNA sequences and character strings are now handled using AVL trees.

Browse Source
This commit is contained in:
Celine Mercier
2015-12-11 17:24:44 +01:00
parent 1586956d57
commit c139367555
26 changed files with 2178 additions and 1711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/obitools3/obidms/_obidms.pyx
View File

@ -133,7 +133,7 @@ cdef class OBIDMS :
index_t nb_lines=0,
index_t nb_elements_per_line=0,
list elements_names=None,
str array_name="default_obiarray",
str avl_name="default_AVL_tree",
str comments=""):
# Declarations
@ -263,7 +263,7 @@ cdef class OBIDMS :
referring,
version_number, data_type,
nb_lines, nb_elements_per_line,
elements_names, array_name,
elements_names, avl_name,
comments)
return column
@ -284,13 +284,13 @@ cdef class OBIDMS_column :
index_t nb_lines,
index_t nb_elements_per_line,
list elements_names,
str array_name,
str avl_name,
str comments):
# Declarations
cdef bytes column_name_b
cdef bytes dms_name_b
cdef bytes array_name_b
cdef bytes avl_name_b
cdef bytes elements_names_b
cdef bytes comments_b
@ -304,7 +304,7 @@ cdef class OBIDMS_column :
# Format the character strings to send them to C functions
column_name_b = str2bytes(column_name)
dms_name_b = str2bytes(self.dms.dms_name)
array_name_b = str2bytes(array_name)
avl_name_b = str2bytes(avl_name)
comments_b = str2bytes(comments)
# Create, clone or open column
@ -315,7 +315,7 @@ cdef class OBIDMS_column :
elements_names_b = str2bytes(";".join(elements_names))
self.pointer = obi_create_column(self.dms.pointer, column_name_b, type,
nb_lines, nb_elements_per_line,
elements_names_b, array_name_b, comments_b,
elements_names_b, avl_name_b, comments_b,
referring)
else :
if clone :