Merged master fixed conflict.

This commit is contained in:
Celine Mercier
2017-02-14 10:58:43 +01:00
33 changed files with 5202 additions and 1256 deletions

View File

@ -0,0 +1,65 @@
../../../src/bloom.h
../../../src/bloom.c
../../../src/char_str_indexer.h
../../../src/char_str_indexer.c
../../../src/crc64.h
../../../src/crc64.c
../../../src/dna_seq_indexer.h
../../../src/dna_seq_indexer.c
../../../src/encode.h
../../../src/encode.c
../../../src/hashtable.h
../../../src/hashtable.c
../../../src/murmurhash2.h
../../../src/murmurhash2.c
../../../src/obi_align.h
../../../src/obi_align.c
../../../src/obiavl.h
../../../src/obiavl.c
../../../src/obiblob_indexer.h
../../../src/obiblob_indexer.c
../../../src/obiblob.h
../../../src/obiblob.c
../../../src/obidebug.h
../../../src/obidms_taxonomy.h
../../../src/obidms_taxonomy.c
../../../src/obidms.h
../../../src/obidms.c
../../../src/obidmscolumn_blob.c
../../../src/obidmscolumn_blob.h
../../../src/obidmscolumn_bool.c
../../../src/obidmscolumn_bool.h
../../../src/obidmscolumn_char.c
../../../src/obidmscolumn_char.h
../../../src/obidmscolumn_float.c
../../../src/obidmscolumn_float.h
../../../src/obidmscolumn_idx.h
../../../src/obidmscolumn_idx.c
../../../src/obidmscolumn_int.c
../../../src/obidmscolumn_int.h
../../../src/obidmscolumn_qual.h
../../../src/obidmscolumn_qual.c
../../../src/obidmscolumn_seq.c
../../../src/obidmscolumn_seq.h
../../../src/obidmscolumn_str.c
../../../src/obidmscolumn_str.h
../../../src/obidmscolumn.h
../../../src/obidmscolumn.c
../../../src/obidmscolumndir.h
../../../src/obidmscolumndir.c
../../../src/obierrno.h
../../../src/obierrno.c
../../../src/obilittlebigman.h
../../../src/obilittlebigman.c
../../../src/obitypes.h
../../../src/obitypes.c
../../../src/obiview.h
../../../src/obiview.c
../../../src/sse_banded_LCS_alignment.h
../../../src/sse_banded_LCS_alignment.c
../../../src/uint8_indexer.h
../../../src/uint8_indexer.c
../../../src/upperband.h
../../../src/upperband.c
../../../src/utils.h
../../../src/utils.c

View File

@ -4,7 +4,8 @@ from obitools3.apps.progress cimport ProgressBar # @UnresolvedImport
from obitools3.obidms._obidms cimport OBIDMS # TODO cimport doesn't work
from obitools3.utils cimport str2bytes
from obitools3.obidms.capi.obialign cimport obi_lcs_align_one_column
from obitools3.obidms.capi.obialign cimport obi_lcs_align_one_column, \
obi_lcs_align_two_columns
import time
@ -146,6 +147,13 @@ def addOptions(parser):
default=False,
help="Sequence counts are written in the output view. Default: they are not written.")
group.add_argument('--thread-count','-p', # TODO should probably be in a specific option group
action="store", dest="align:threadcount",
metavar='<THREAD COUNT>',
default=1,
type=int,
help="Number of threads to use for the computation. Default: one.")
cpdef align(str dms_n,
str input_view_1_n, str output_view_n,
@ -156,24 +164,42 @@ cpdef align(str dms_n,
double threshold=0.0, bint normalize=True,
int reference=0, bint similarity_mode=True,
bint print_seq=False, bint print_count=False,
comments="") :
comments="",
int thread_count=1) :
cdef OBIDMS d
d = OBIDMS(dms_n)
# Align 1 column (2 columns not implemented yet)
if obi_lcs_align_one_column(d._pointer, \
str2bytes(input_view_1_n), \
str2bytes(input_column_1_n), \
str2bytes(input_elt_1_n), \
str2bytes(id_column_1_n), \
str2bytes(output_view_n), \
str2bytes(comments), \
print_seq, \
print_count, \
threshold, normalize, reference, similarity_mode) < 0 :
raise Exception("Error aligning sequences")
if input_view_2_n == "" and input_column_2_n == "" :
if obi_lcs_align_one_column(d._pointer, \
str2bytes(input_view_1_n), \
str2bytes(input_column_1_n), \
str2bytes(input_elt_1_n), \
str2bytes(id_column_1_n), \
str2bytes(output_view_n), \
str2bytes(comments), \
print_seq, \
print_count, \
threshold, normalize, reference, similarity_mode,
thread_count) < 0 :
raise Exception("Error aligning sequences")
else :
if obi_lcs_align_two_columns(d._pointer, \
str2bytes(input_view_1_n), \
str2bytes(input_view_2_n), \
str2bytes(input_column_1_n), \
str2bytes(input_column_2_n), \
str2bytes(input_elt_1_n), \
str2bytes(input_elt_2_n), \
str2bytes(id_column_1_n), \
str2bytes(id_column_2_n), \
str2bytes(output_view_n), \
str2bytes(comments), \
print_seq, \
print_count, \
threshold, normalize, reference, similarity_mode) < 0 :
raise Exception("Error aligning sequences")
d.close()
@ -199,8 +225,9 @@ def run(config):
similarity_mode = config['align']['similarity'], \
print_seq = config['align']['printseq'], \
print_count = config['align']['printcount'], \
comments = comments)
comments = comments, \
thread_count = config['align']['threadcount'])
print("Done.")

View File

@ -97,8 +97,7 @@ def test_set_and_get(config, infos):
return
idx = random_int(config)
value = infos['random_generator'][data_type](config)
if len(element_names) > 1 :
if col.nb_elements_per_line > 1 :
elt = random.choice(element_names)
col[idx][elt] = value
assert col[idx][elt] == value, "Set value != gotten value "+str(col[idx][elt])+" != "+str(value)
@ -187,6 +186,7 @@ def create_random_column(config, infos) :
elements_names = []
for i in range(nb_elements_per_line) :
elements_names.append(random_unique_element_name(config, infos))
elements_names = random.choice([None, elements_names])
name = random_unique_name(infos)
infos['view'].add_column(name,
alias=alias,
@ -358,7 +358,9 @@ def run(config):
config['test']['elt_name_max_len'] = int((COL_COMMENTS_MAX_LEN - config['test']['maxelts']) / config['test']['maxelts'])
print("Initializing the DMS and the first view...")
shutil.rmtree(config['obi']['defaultdms']+'.obidms', ignore_errors=True)
ini_dms_and_first_view(config, infos)
print_test(config, repr(infos['view']))

View File

@ -7,7 +7,8 @@ from .capi.obidms cimport obi_dms, \
from .capi.obidmscolumn cimport obi_close_column, \
OBIDMS_column_p, \
OBIDMS_column_header_p
OBIDMS_column_header_p, \
obi_get_elements_names
from .capi.obiutils cimport obi_format_date
@ -73,7 +74,7 @@ from .capi.obiview cimport Obiview_p, \
DEFINITION_COLUMN, \
QUALITY_COLUMN
from libc.stdlib cimport malloc
from libc.stdlib cimport malloc, free
@ -100,17 +101,17 @@ cdef class OBIDMS_column :
def __getitem__(self, index_t line_nb):
return self.get_line(line_nb)
def __len__(self):
return self.lines_used
def __len__(self): # TODO discuss
return self._view.line_count
def __sizeof__(self):
return ((self._pointer)[0].header.header_size + (self._pointer)[0].header.data_size)
def __iter__(self):
def __iter__(self): # TODO discuss
# Declarations
cdef index_t line_nb
# Yield each line
for line_nb in range(self.lines_used):
for line_nb in range(self._view.line_count):
yield self.get_line(line_nb)
def __str__(self) :
@ -138,7 +139,12 @@ cdef class OBIDMS_column :
# elements_names property getter
@property
def elements_names(self):
return (bytes2str(((self._pointer)[0].header).elements_names)).split(';')
cdef char* elts_names_b
cdef str elts_names
elts_names_b = obi_get_elements_names((self._pointer)[0])
elts_names = bytes2str(elts_names_b)
free(<char*>elts_names_b)
return elts_names.split(';')
# nb_elements_per_line property getter
@property
@ -160,11 +166,6 @@ cdef class OBIDMS_column :
def version(self):
return ((self._pointer)[0].header).version
# lines_used property getter
@property
def lines_used(self):
return (self._pointer)[0].header.lines_used
# comments property getter
@property
def comments(self):
@ -268,15 +269,6 @@ cdef class OBIDMS_column_line :
######################################################################################################
######################################################################################################
######################################################################################################
cdef class OBIView_line :
def __init__(self, OBIView view, index_t line_nb) :
@ -424,7 +416,7 @@ cdef class OBIDMS :
cdef int i, j
cdef str column_name
view_infos_p = obi_view_map_file(self._pointer, str2bytes(view_name))
view_infos_p = obi_view_map_file(self._pointer, str2bytes(view_name), True)
view_infos_d = {}
view_infos_d["name"] = bytes2str(view_infos_p.name)
view_infos_d["comments"] = bytes2str(view_infos_p.comments)

View File

@ -22,7 +22,7 @@ cdef class OBIDMS_column_str(OBIDMS_column):
result = None
else :
result = bytes2str(value)
# NOTE: value is not freed because the pointer points to a mmapped region in an AVL data file. (TODO discuss)
# NOTE: value is not freed because the pointer points to a mmapped region in an AVL data file.
return result
cpdef set_line(self, index_t line_nb, object value):
@ -46,7 +46,7 @@ cdef class OBIDMS_column_multi_elts_str(OBIDMS_column_multi_elts):
result = None
else :
result = bytes2str(value)
# NOTE: value is not freed because the pointer points to a mmapped region in an AVL data file. (TODO discuss)
# NOTE: value is not freed because the pointer points to a mmapped region in an AVL data file.
return result
cpdef object get_line(self, index_t line_nb) :
@ -65,7 +65,7 @@ cdef class OBIDMS_column_multi_elts_str(OBIDMS_column_multi_elts):
value_in_result = None
else :
value_in_result = bytes2str(value)
# NOTE: value is not freed because the pointer points to a mmapped region in an AVL data file. (TODO discuss)
# NOTE: value is not freed because the pointer points to a mmapped region in an AVL data file.
result[self.elements_names[i]] = value_in_result
if all_NA and (value_in_result is not None) :
all_NA = False

View File

@ -17,4 +17,5 @@ cdef class OBI_Taxonomy :
cdef class OBI_Taxon :
cdef ecotx_t* _pointer
cdef ecotx_t* _pointer
cdef OBI_Taxonomy _tax

View File

@ -7,10 +7,10 @@ from .capi.obitaxonomy cimport obi_read_taxonomy, \
obi_write_taxonomy, \
obi_close_taxonomy, \
obi_taxo_get_taxon_with_taxid, \
obi_taxonomy_add_local_taxon, \
obi_taxo_add_local_taxon, \
obi_taxo_add_preferred_name_with_taxon, \
ecotx_t
from ._obidms cimport OBIDMS
from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer
@ -42,11 +42,11 @@ cdef class OBI_Taxonomy :
if taxon_p == NULL :
raise Exception("Taxon not found")
taxon_capsule = PyCapsule_New(taxon_p, NULL, NULL)
return OBI_Taxon(taxon_capsule)
return OBI_Taxon(taxon_capsule, self)
else :
raise Exception("Not implemented")
def __iter__(self):
cdef ecotx_t* taxa
@ -60,7 +60,7 @@ cdef class OBI_Taxonomy :
for t in range(self._pointer.taxa.count):
taxon_p = <ecotx_t*> (taxa+t)
taxon_capsule = PyCapsule_New(taxon_p, NULL, NULL)
yield OBI_Taxon(taxon_capsule)
yield OBI_Taxon(taxon_capsule, self)
cpdef write(self, str prefix) :
@ -70,7 +70,7 @@ cdef class OBI_Taxonomy :
cpdef int add_taxon(self, str name, str rank_name, int parent_taxid, int min_taxid=10000000) :
cdef int taxid
taxid = obi_taxonomy_add_local_taxon(self._pointer, str2bytes(name), str2bytes(rank_name), parent_taxid, min_taxid)
taxid = obi_taxo_add_local_taxon(self._pointer, str2bytes(name), str2bytes(rank_name), parent_taxid, min_taxid)
if taxid < 0 :
raise Exception("Error adding a new taxon to the taxonomy")
else :
@ -85,10 +85,11 @@ cdef class OBI_Taxonomy :
cdef class OBI_Taxon : # TODO dict subclass?
def __init__(self, object taxon_capsule) :
def __init__(self, object taxon_capsule, OBI_Taxonomy tax) :
self._pointer = <ecotx_t*> PyCapsule_GetPointer(taxon_capsule, NULL)
if self._pointer == NULL :
raise Exception("Error reading the taxonomy")
raise Exception("Error reading a taxon (NULL pointer)")
self._tax = tax
# name property getter
@property
@ -115,14 +116,25 @@ cdef class OBI_Taxon : # TODO dict subclass?
def parent(self):
cdef object parent_capsule
parent_capsule = PyCapsule_New(self._pointer.parent, NULL, NULL)
return OBI_Taxon(parent_capsule)
return OBI_Taxon(parent_capsule, self._tax)
# preferred name property getter and setter
@property
def preferred_name(self):
if self._pointer.preferred_name != NULL :
return bytes2str(self._pointer.preferred_name)
@preferred_name.setter
def preferred_name(self, str new_preferred_name) : # @DuplicatedSignature
if (obi_taxo_add_preferred_name_with_taxon(self._tax._pointer, self._pointer, str2bytes(new_preferred_name)) < 0) :
raise Exception("Error adding a new preferred name to a taxon")
def __repr__(self):
d = {}
d['taxid'] = self.taxid
d['name'] = self.name
d['parent'] = self.parent.taxid
d['farest'] = self.farest
d['taxid'] = self.taxid
d['name'] = self.name
d['preferred name'] = self.preferred_name
d['parent'] = self.parent.taxid
d['farest'] = self.farest
return str(d)

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -18,5 +18,24 @@ cdef extern from "obi_align.h" nogil:
double threshold,
bint normalize,
int reference,
bint similarity_mode)
bint similarity_mode,
int thread_count)
int obi_lcs_align_two_columns(OBIDMS_p dms,
const_char_p seq1_view_name,
const_char_p seq2_view_name,
const_char_p seq1_column_name,
const_char_p seq2_column_name,
const_char_p seq1_elt_name,
const_char_p seq2_elt_name,
const_char_p id1_column_name,
const_char_p id2_column_name,
const_char_p output_view_name,
const_char_p output_view_comments,
bint print_seq,
bint print_count,
double threshold,
bint normalize,
int reference,
bint similarity_mode);

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -47,31 +47,8 @@ cdef extern from "obidmscolumn.h" nogil:
bint writable
ctypedef OBIDMS_column_t* OBIDMS_column_p
OBIDMS_column_p obi_create_column(OBIDMS_p dms,
const_char_p column_name,
OBIType_t type,
index_t nb_lines,
index_t nb_elements_per_line,
const_char_p elements_names,
const_char_p indexer_name,
const_char_p associated_colum_name,
obiversion_t associated_colum_version,
const_char_p comments)
OBIDMS_column_p obi_open_column(OBIDMS_p dms,
const_char_p column_name,
obiversion_t version_number)
int obi_close_column(OBIDMS_column_p column)
OBIDMS_column_p obi_clone_column(OBIDMS_p dms,
OBIDMS_column_p line_selection,
const_char_p column_name,
obiversion_t version_number,
bint clone_data)
int obi_close_column(OBIDMS_column_p column)
obiversion_t obi_column_get_latest_version_from_name(OBIDMS_p dms,
const_char_p column_name)
@ -81,9 +58,9 @@ cdef extern from "obidmscolumn.h" nogil:
obiversion_t version_number)
int obi_close_header(OBIDMS_column_header_p header)
int obi_select(OBIDMS_column_p line_selection_column, index_t line_to_grep)
char* obi_get_elements_names(OBIDMS_column_p column)
cdef extern from "obidmscolumn_int.h" nogil:

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -13,7 +13,8 @@ cdef extern from "obidms_taxonomy.h" nogil:
int32_t farest
ecotxnode* parent
char* name
char* preferred_name
ctypedef ecotxnode ecotx_t
@ -56,4 +57,9 @@ cdef extern from "obidms_taxonomy.h" nogil:
ecotx_t* obi_taxo_get_superkingdom(ecotx_t* taxon, OBIDMS_taxonomy_p taxonomy)
int obi_taxonomy_add_local_taxon(OBIDMS_taxonomy_p tax, const char* name, const char* rank_name, int32_t parent_taxid, int32_t min_taxid)
int obi_taxo_add_local_taxon(OBIDMS_taxonomy_p tax, const char* name, const char* rank_name, int32_t parent_taxid, int32_t min_taxid)
int obi_taxo_add_preferred_name_with_taxid(OBIDMS_taxonomy_p tax, int32_t taxid, const char* preferred_name)
int obi_taxo_add_preferred_name_with_taxon(OBIDMS_taxonomy_p tax, ecotx_t* taxon, const char* preferred_name)

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -0,0 +1,65 @@
../../../../src/bloom.h
../../../../src/bloom.c
../../../../src/char_str_indexer.h
../../../../src/char_str_indexer.c
../../../../src/crc64.h
../../../../src/crc64.c
../../../../src/dna_seq_indexer.h
../../../../src/dna_seq_indexer.c
../../../../src/encode.h
../../../../src/encode.c
../../../../src/hashtable.h
../../../../src/hashtable.c
../../../../src/murmurhash2.h
../../../../src/murmurhash2.c
../../../../src/obi_align.h
../../../../src/obi_align.c
../../../../src/obiavl.h
../../../../src/obiavl.c
../../../../src/obiblob_indexer.h
../../../../src/obiblob_indexer.c
../../../../src/obiblob.h
../../../../src/obiblob.c
../../../../src/obidebug.h
../../../../src/obidms_taxonomy.h
../../../../src/obidms_taxonomy.c
../../../../src/obidms.h
../../../../src/obidms.c
../../../../src/obidmscolumn_blob.c
../../../../src/obidmscolumn_blob.h
../../../../src/obidmscolumn_bool.c
../../../../src/obidmscolumn_bool.h
../../../../src/obidmscolumn_char.c
../../../../src/obidmscolumn_char.h
../../../../src/obidmscolumn_float.c
../../../../src/obidmscolumn_float.h
../../../../src/obidmscolumn_idx.h
../../../../src/obidmscolumn_idx.c
../../../../src/obidmscolumn_int.c
../../../../src/obidmscolumn_int.h
../../../../src/obidmscolumn_qual.h
../../../../src/obidmscolumn_qual.c
../../../../src/obidmscolumn_seq.c
../../../../src/obidmscolumn_seq.h
../../../../src/obidmscolumn_str.c
../../../../src/obidmscolumn_str.h
../../../../src/obidmscolumn.h
../../../../src/obidmscolumn.c
../../../../src/obidmscolumndir.h
../../../../src/obidmscolumndir.c
../../../../src/obierrno.h
../../../../src/obierrno.c
../../../../src/obilittlebigman.h
../../../../src/obilittlebigman.c
../../../../src/obitypes.h
../../../../src/obitypes.c
../../../../src/obiview.h
../../../../src/obiview.c
../../../../src/sse_banded_LCS_alignment.h
../../../../src/sse_banded_LCS_alignment.c
../../../../src/uint8_indexer.h
../../../../src/uint8_indexer.c
../../../../src/upperband.h
../../../../src/upperband.c
../../../../src/utils.h
../../../../src/utils.c

View File

@ -68,7 +68,7 @@ cdef extern from "obiview.h" nogil:
Obiview_p obi_new_view_nuc_seqs_cloned_from_name(OBIDMS_p dms, const_char_p view_name, const_char_p view_to_clone_name, index_t* line_selection, const_char_p comments, bint quality_column)
Obiview_infos_p obi_view_map_file(OBIDMS_p dms, const char* view_name)
Obiview_infos_p obi_view_map_file(OBIDMS_p dms, const char* view_name, bint finished)
int obi_view_unmap_file(OBIDMS_p dms, Obiview_infos_p view_infos)
@ -94,11 +94,7 @@ cdef extern from "obiview.h" nogil:
OBIDMS_column_p* obi_view_get_pointer_on_column_in_view(Obiview_p view, const_char_p column_name)
int obi_view_create_column_alias(Obiview_p view, const_char_p current_name, const_char_p alias)
int obi_save_view(Obiview_p view)
int obi_close_view(Obiview_p view)
int obi_view_create_column_alias(Obiview_p view, const_char_p current_name, const_char_p alias)
int obi_save_and_close_view(Obiview_p view)