Celine Mercier
3db93ee9c4
Fixed stdout output
2024-01-12 16:13:30 +13:00
Celine Mercier
4844b20770
Merge branch 'master' of https://git.metabarcoding.org/obitools/obitools3
2024-01-12 15:36:58 +13:00
Celine Mercier
0d98a4f717
Switch to version 3.0.1b26
2024-01-10 16:40:08 +13:00
Celine Mercier
837ff1a1ba
Taxonomy: fixed an issue related to StopIteration behaviour in new
...
versions of python
2024-01-10 15:53:15 +13:00
Celine Mercier
aeed42456a
export: columns are now in alphabetical order when exporting to tab
...
format
2024-01-10 15:52:28 +13:00
Celine Mercier
fb6e27bb5d
Revert "Testing RAM instead of mmap for blob alignment"
...
This reverts commit 6d94cdcc0d
2023-11-29 04:22:31 +01:00
Celine Mercier
6d94cdcc0d
Testing RAM instead of mmap for blob alignment
2023-11-29 16:19:34 +13:00
Celine Mercier
8a1f844645
obi import: fixed bug caused by new behaviour of StopIteration
...
exceptions in Python>=3.7
2023-09-21 17:47:40 +12:00
Celine Mercier
791ccfb92e
Fixed include bug in previous version and switch to version 3.0.1b24
2023-05-15 11:35:42 +12:00
Celine Mercier
1c9a906f5b
ngsfilter and ecopcr: now check for primers too long for apat library to
...
handle (31bp max) and switch to version 3.0.1b23
2023-05-12 17:04:21 +12:00
Celine Mercier
55b2679b23
New command obi rm and switch to version 3.0.1b22
2023-05-08 17:48:50 +12:00
Celine Mercier
9ea2124adc
Switch to version 3.0.1b21
2023-02-13 11:00:01 +13:00
Celine Mercier
2130a949c7
New command: obi taxonomy to add local taxa ( closes #64 )
2023-02-13 10:59:20 +13:00
Celine Mercier
eeb93afa7d
import: now automatically renames scientific_name tag to
...
`SCIENTIFIC_NAME`, and suggests using `--input-na-string` when a
sequence import fails
2023-02-13 10:40:38 +13:00
Celine Mercier
755ce179ad
head: added output format options
2023-02-13 10:31:26 +13:00
Celine Mercier
7e492578b3
Switch to version 3.0.1b20
2022-09-21 11:33:03 +12:00
Celine Mercier
02e9df3ad1
alignpairedend and ngsfilter: ids of original sequences are now kept
2022-09-21 11:32:19 +12:00
mercierc
55ada80500
import: made ngsfilter file parsing more resilient and switching to
...
version 3.0.1b19
2022-07-15 16:02:21 +12:00
mercierc
ef9d9674b0
obi import: added SINTAX format import and switch to version 3.0.1b18
2022-05-17 09:36:33 +12:00
mercierc
4f39bb2418
switch to version 3.0.1b17
2022-05-03 10:55:36 +12:00
mercierc
0a2b8adb50
import: added import of UNITE fasta format
2022-05-03 10:54:41 +12:00
mercierc
f9b99a9397
annotate: fixed a bug where a column type could be wrongly guessed and
...
switch to version 3.0.1b16
2022-03-30 16:32:07 +13:00
Celine Mercier
ce2833c04b
switch to version v3.0.1b15
2022-02-25 17:48:44 +13:00
Celine Mercier
f64b3da30b
split command
2022-02-25 17:44:18 +13:00
mercierc
388b3e0410
removed a trace
2021-11-11 15:53:27 +13:00
mercierc
c9db990b83
switch to version 3.0.1b14
2021-11-11 15:28:00 +13:00
mercierc
3f253feb5e
Cython: View: fixed keys method to get list of view keys
2021-11-11 15:27:32 +13:00
mercierc
85d2bab607
small fix
2021-11-11 15:26:48 +13:00
mercierc
53b3d81137
small fixes and improvements
2021-11-11 15:26:09 +13:00
mercierc
f6353fbf28
obi export: added options to export to metabaR compatible format
2021-11-11 15:24:12 +13:00
mercierc
5a8b9dca5d
goes with previous commit
2021-11-11 15:12:04 +13:00
mercierc
8bd6d6c8e9
Python: URI decoding: now properly checking that paths can be encoded in
...
ASCII (issue #89 )
2021-11-02 11:17:59 +13:00
mercierc
405e6ef420
Python: URI decoding: added metabaR output
2021-11-02 11:16:29 +13:00
mercierc
fedacfafe7
switch to version 3.0.1b13
2021-09-13 11:46:17 +12:00
mercierc
2d66e0e965
python: genbank parser: better handling of white spaces
2021-09-13 11:44:38 +12:00
mercierc
f43856b712
switch to version 3.0.1b12
2021-09-08 10:56:55 +12:00
mercierc
9e0c319806
Cython: fixed rewriting of column when rewriting a 1 element dict column
2021-09-08 10:54:23 +12:00
mercierc
58b42cd977
C: views: now correctly parses view names containing '.' when cleaning
...
unfinished views. Closes #115
2021-09-08 10:52:42 +12:00
mercierc
34de90bce6
ngsfilter: checks better if there is an associated sequencing quality
2021-09-08 10:30:11 +12:00
mercierc
4be9f36f99
stats: fixed the computation of variance when it is equal to 0
2021-08-05 11:32:16 +12:00
mercierc
f10e78ba3c
C: fixed the printing of view informations from a DMS ( fixes #114 )
2021-08-05 11:31:24 +12:00
mercierc
88c8463ed7
Cython: taxonomy: improved logging
2021-08-05 11:29:20 +12:00
mercierc
89168271ef
ecopcr: now accepting taxonomy from a different DMS than the reference
...
sequences
2021-08-05 11:28:57 +12:00
mercierc
82d2642000
Switch to version 3.0.1b11
2021-07-22 09:25:39 +12:00
mercierc
99c1cd60d6
export: now exports header for tabular files by default and added option
...
to only export specific columns
2021-07-22 09:23:18 +12:00
mercierc
ce7ae4ac55
export: fixed 'only' option printing one too many if printing header
2021-07-21 15:23:04 +12:00
mercierc
0b4283bb58
cat: improved error handling
2021-07-21 15:22:08 +12:00
mercierc
747f3efbb2
Improved taxonomy reading information display
2021-07-21 15:20:44 +12:00
mercierc
6c1a3aff47
Fixed the handling of sample names that are numbers (forcing conversion)
2021-07-21 15:19:24 +12:00
mercierc
e2932b05f2
Implements #108 export integer missing values as 0 for tables by default
2021-07-21 14:41:54 +12:00
mercierc
32345b9ec4
Addresses #111
2021-07-19 15:55:25 +12:00
mercierc
9334cf6cc6
import: improved genbank parser and switch to version 3.0.1.b10
2021-06-17 08:42:01 +12:00
mercierc
8ec13a294c
Switch to version 3.0.1b9
2021-06-01 09:21:43 +12:00
mercierc
3e45c34491
import: now imports and adds taxids for SILVA and RDP files, added
...
import of lists, fixed skipping of errors (was not overwriting), and
fixed --no-progress-bar option
2021-06-01 09:21:07 +12:00
mercierc
c2f3d90dc1
build_ref_db: set default threshold to 0.99
2021-06-01 09:11:17 +12:00
mercierc
6b732d11d3
align: fixed column URI parsing
2021-06-01 09:10:21 +12:00
mercierc
9eb833a0af
typo fix
2021-06-01 09:09:16 +12:00
mercierc
6b7b0e3bd1
cat: fixed the handling of dictionary columns
2021-06-01 09:06:13 +12:00
mercierc
47691a8f58
count: added option to specify the count column
2021-06-01 09:05:14 +12:00
mercierc
b908b581c8
clean: hid not implemented option
2021-06-01 09:04:22 +12:00
mercierc
03c174fd7a
grep: added taxonomy check
2021-05-31 17:03:39 +12:00
mercierc
2156588ff6
added TODO comment
2021-05-31 17:01:57 +12:00
mercierc
6ff29c6a6a
Increased maximum line count to 10E12
2021-05-31 17:00:55 +12:00
mercierc
51a3c68fb5
C: build_reference_db: fixed gcc warning/error
2021-05-31 16:59:17 +12:00
mercierc
da91ffc2c7
URI decoding: fixed reading a taxonomy before any view
2021-05-31 16:57:20 +12:00
mercierc
c884615522
obi stats: various fixes and improvements
2021-05-31 16:51:06 +12:00
mercierc
cb53381863
ecotag: BEST_MATCH_TAXIDS now dereplicated (no repeated taxids in the
...
list) and switch to version 3.0.1b8
2021-05-10 16:02:06 +12:00
MercierC
72b3e5d872
switch to version 3.0.1b7
2021-04-07 10:31:54 +12:00
MercierC
238e9f70f3
alignpairedend: fixed bug that would cut out sequence ends when it
...
should not have
2021-04-07 10:31:12 +12:00
MercierC
e099a16624
small fixes
2021-04-07 10:28:02 +12:00
MercierC
847c9c816d
import: fixed count estimation for tabular files with header
2021-03-30 09:07:14 +13:00
MercierC
6026129ca8
Fixes 101
2021-03-30 09:06:08 +13:00
MercierC
169b6514b4
small doc fixes
2021-03-29 13:07:48 +13:00
MercierC
89b0c48141
switch to version 3.0.1b6
2021-03-29 11:18:44 +13:00
MercierC
7c02782e3c
import/export: workaround for issue where flake8(?) reads '\t' as
...
'\'+'t' when parsing an option value
2021-03-29 11:18:19 +13:00
MercierC
ecc4c2c78b
stats: improved the tabular display
2021-03-29 09:03:32 +13:00
MercierC
f5413381fd
C: taxonomy: fixed a bug where some taxa would not be stored in the
...
merged index
2021-03-29 09:02:18 +13:00
MercierC
3e93cfff7b
import: Columns are now rewritten in OBI_FLOAT if a value is > INT32_MAX
2021-03-29 09:00:52 +13:00
MercierC
6d445fe3ad
switch to version 3.0.1b5
2021-03-22 09:41:01 +13:00
MercierC
824deb7e21
new command: obi rm: deletes any view (for now the user deleting a view
...
accepts that there will be missing information when running obi history
if other views came from the deleted view)
2021-03-18 09:17:06 +13:00
MercierC
d579bb2749
switch to version 3.0.1b4
2021-03-16 17:40:58 +13:00
MercierC
10e5ebdbc0
ngsfilter: fixed critical bug where barcodes shorter than the forward
...
primer would be missed
2021-03-16 15:09:28 +13:00
MercierC
8833110490
import: fixed the import of tabular files with no header
2021-03-16 09:15:48 +13:00
MercierC
bd38449f2d
switch to version 3.0.1b3
2021-03-15 16:50:17 +13:00
MercierC
904823c827
uniq: now OK to use -m option even if only one unique key in information
...
to merge (e.g. one sample)
2021-03-15 16:48:22 +13:00
MercierC
af68a1024c
Switch to version 3.0.1b2
2021-03-15 16:26:43 +13:00
MercierC
425fe25bd2
Made the OBITools3 more 'empty file friendly'
2021-03-15 16:25:41 +13:00
Celine Mercier
d48aed38d4
switch to version 3.0.1b1
2021-03-11 17:11:23 +13:00
Celine Mercier
5e32f8523e
Merge branch 'wsl_version'
2021-03-11 16:47:59 +13:00
Celine Mercier
8f1d94fd24
obi test: fixed bug introduced in ad1fd3c3
2021-03-11 16:31:31 +13:00
MercierC
38f42cb0fb
C: Made maximum file path length 2048 instead of 1024
2021-03-11 15:23:22 +13:00
MercierC
7f0f63cf26
C: now completely unmapping files before truncating them to a smaller
...
size (#68 )
2021-03-11 15:12:40 +13:00
Celine Mercier
cba78111c9
obi test: fixed bug introduced in previous version
2021-03-11 11:36:52 +13:00
Celine Mercier
41fbae7b6c
Switch to version 3.0.0b43
2021-03-10 16:52:03 +13:00
Celine Mercier
ad1fd3c341
Now handling dictionaries with one key
2021-03-10 16:50:30 +13:00
Celine Mercier
fbf0f7dfb6
import: improved genbank parser and switch to version 3.0.0b42
2021-02-17 15:26:35 +13:00
Celine Mercier
fda0edd0d8
Switch to version 3.0.0b41
2021-02-10 17:29:08 +13:00
Celine Mercier
382e37a6ae
Fixes #88
2021-02-10 17:28:49 +13:00
Celine Mercier
5cc3e29f75
obi test: made less heavy by default
2021-02-10 17:28:15 +13:00
Celine Mercier
a8e2aee281
Switch to version 3.0.0b40
2021-02-06 14:45:07 +13:00
13adb479d3
Adds an extern qualifier to the keep_running declaration.
2021-02-05 15:59:43 +01:00
Celine Mercier
8ba7acdfe1
export: fixed a bug where exporting to tab format with a header would
...
not export the first line of data and switch to version 3.0.0b39
2021-01-13 16:09:04 +01:00
Celine Mercier
38051b1e4f
Removed spurious commentaries
2021-01-13 16:07:42 +01:00
Celine Mercier
52a2e21b38
grep: fixed --id-list option
...
and switch to version 3.0.0b38
2020-11-06 16:36:37 +01:00
Celine Mercier
d27a5b9115
Switch to version 3.0.0b37
2020-10-30 10:47:13 +01:00
Celine Mercier
20bd3350b4
New command: obi addtaxids to add NCBI taxids to sequences from their
...
taxon name.
2020-10-30 10:46:55 +01:00
Celine Mercier
2e191372d7
Now handling sequences with Uracil (U) nucleotides by converting to
...
Thymine (T)
2020-10-30 10:46:17 +01:00
Celine Mercier
112e12cab0
Taxonomy: new functions to find taxa by name
2020-10-30 10:45:20 +01:00
Celine Mercier
b9b4cec5b5
import: now can import SILVA fasta files
2020-10-30 10:43:04 +01:00
Celine Mercier
199f3772e8
Small fixes (potential compilation problems)
2020-10-30 10:41:58 +01:00
Celine Mercier
422a6450fa
ecotag: clarified similarity circle documentation
2020-09-29 17:57:29 +02:00
Celine Mercier
137c109f86
obi ls: now done in C (preparing things for R packages to read DMS) and
...
switch to version 3.0.0b36
2020-09-29 17:51:39 +02:00
Celine Mercier
b6648ae81e
Revert "Fixed version numbering mistake (should be b34 not b35)"
...
This reverts commit f6dffbecfe
2020-09-25 16:25:39 +02:00
Celine Mercier
f6dffbecfe
Fixed version numbering mistake (should be b34 not b35)
2020-09-25 16:24:23 +02:00
Celine Mercier
c4696ac865
ecotag: added separate threshold for minimum circle identity (and switch
...
to version 3.0.0b35
2020-09-25 16:22:09 +02:00
Celine Mercier
11a0945a9b
obi cat: fixed open file descriptor leak and switch to version 3.0.0b34
2020-08-28 10:41:22 +02:00
Celine Mercier
f23c40c905
obi cat: fixed a bug introduced in 3.0.0b28 and switch to version
...
3.0.0b33
2020-08-27 18:38:16 +02:00
Celine Mercier
f99fc13b75
switch to version 3.0.0b32
2020-08-13 18:17:09 +02:00
Celine Mercier
1da6aac1b8
C: patch for failed creation of AVL with errno EEXIST
2020-08-12 17:55:08 +02:00
Celine Mercier
159803b40a
export: now automatically sorts dictionary keys alphabetically for
...
tab/csv output
2020-07-31 16:43:35 +02:00
Celine Mercier
7dcbc34017
import: fixed entry count estimation when importing fastq files
2020-07-30 16:56:36 +02:00
Celine Mercier
db2202c8b4
uniq: added a check to make sure that there is more than one element for
...
one tag when merging its information
2020-07-30 16:14:37 +02:00
Celine Mercier
d33ff97846
switch to version 3.0.0b31
2020-07-28 09:31:19 +02:00
Celine Mercier
1dcdf69f1f
export: fixed a bug introduced in version 3.0.0b28
2020-07-28 09:31:05 +02:00
Celine Mercier
dec114eed6
Python: added "date created" information in view representation
2020-07-27 17:38:45 +02:00
Celine Mercier
f36691053b
Python: added the OBITools3 version that generated the view in view
...
comments
2020-07-27 16:50:00 +02:00
Celine Mercier
f2aa5fcf8b
alignpairedend: fixed division by 0 bug and switch to version 3.0.0b30
2020-07-27 10:15:59 +02:00
Celine Mercier
bccb3e6874
switch to version 3.0.0b29
2020-07-26 17:40:26 +02:00
Celine Mercier
f5a17bea68
C: added a missing error check
2020-07-26 17:39:55 +02:00
Celine Mercier
e28507639a
C and Cython: fixed and improved the associated columns system
2020-07-26 17:39:29 +02:00
Celine Mercier
e6feac93fe
obi test: made less heavy to be faster
2020-07-26 17:37:21 +02:00
Celine Mercier
50b292b489
obi import: added --space-priority option to import a view line by line
2020-07-26 17:36:52 +02:00
Celine Mercier
24a737aa55
switch to version 3.0.0b28
2020-07-24 16:10:10 +02:00
Celine Mercier
8aa455ad8a
Python: made all commands handle output to buffer object (e.g. stdout)
2020-07-24 16:09:48 +02:00
Celine Mercier
46ca693ca9
Cython: View: new method to print a view to a buffer (e.g. stdout)
2020-07-24 16:03:23 +02:00
Celine Mercier
9a9afde113
Cython: progress bar: set default refresh rate to 5 seconds
2020-07-24 15:29:12 +02:00
Celine Mercier
8dd403a118
grep: now prints the number of entries grepped
2020-07-13 17:08:13 +02:00
Celine Mercier
9672f01c6a
alignpairedend: improved/fixed the output tags for the alignment score
...
and lengths. Removed minimum score option
2020-07-13 15:59:50 +02:00
Celine Mercier
ed9549acfb
ngsfilter: unidentified sequences are now stored untrimmed
2020-07-13 15:56:40 +02:00
Celine Mercier
9ace9989c4
Switch to version 3.0.0b27
2020-07-07 16:47:21 +02:00
Celine Mercier
a3ebe5f118
C: AVL trees: fixed a bug where storing the difference between 2 crc64
...
values in an int64 would mess trees up resulting in failed data
dereplication
2020-07-07 16:47:00 +02:00
Celine Mercier
9100e14899
obi uniq: quick fix for bug where some sequences are not correctly
...
dereplicated
2020-07-03 17:36:57 +02:00
Celine Mercier
ccda0661ce
small help documentation improvement
2020-07-01 18:20:38 +02:00
Celine Mercier
aab59f2214
obi clean: fixed a memory bug, fixed the behaviour when no sample info,
...
and added checks warnings and error handling when sample info not
dereplicated
2020-07-01 18:17:47 +02:00
Celine Mercier
ade1107b42
switch to version 3.0.0b26
2020-06-17 18:56:07 +02:00
Celine Mercier
9c7d24406f
export: dictionaries are now formatted like in the original OBITools
...
when exporting in tabular format and tuple formatting is cleaner
2020-06-17 18:55:46 +02:00
Celine Mercier
03bc9915f2
Cython: utils: added handling of tuples to bytes2str_object function
2020-06-17 18:54:14 +02:00
Celine Mercier
24b1dab573
Cython: Columns: added a keys() method that returns all element names
2020-06-17 18:53:41 +02:00
Celine Mercier
7593673f3f
ngsfilter: now setting 'reversed' tag to False instead of None when
...
false
2020-06-17 18:52:35 +02:00
Celine Mercier
aa01236cae
switch to version 3.0.0b25
2020-06-13 21:48:49 +02:00
Celine Mercier
49b8810a76
C: made indexer opening/closing cleaner
2020-06-13 21:47:03 +02:00
Celine Mercier
7a39df54c0
ls: fixed an issue where big DMS couldn't be read by ls
2020-06-13 21:45:22 +02:00
Celine Mercier
09e483b0d6
switch to temporary version 3.0.0b24a
2020-06-10 17:47:56 +02:00
Celine Mercier
14a2579173
uniq: now outputs an empty view if input view is empty instead of
...
displaying an error
2020-06-10 17:47:26 +02:00
Celine Mercier
36a8aaa92e
grep: now creating empty views instead of displaying an error when
...
selecting on an unexisting column/tag
2020-06-10 16:57:42 +02:00
Celine Mercier
a17eb445c2
ngsfilter: made one of the tag error messages more accurate
2020-06-10 16:27:36 +02:00
Celine Mercier
e4a32788c2
Switch to version 3.0.0b24
2020-06-09 14:36:58 +02:00
Celine Mercier
2442cc80bf
Cython: View: fixed bash history display
2020-06-09 14:36:37 +02:00
Celine Mercier
aa836b2ace
uniq: improved progress bar of second browsing
2020-06-09 14:36:02 +02:00
Celine Mercier
8776ce22e6
C: fixed a bug where indexers referring to tuples of certain types were
...
not properly closed and imported
2020-06-09 14:34:43 +02:00
Celine Mercier
4aa772c405
ecotag: Added list of taxids for all best matches ( closes #80 )
2020-06-09 14:33:14 +02:00
Celine Mercier
b0b96ac37a
version 3.0.0b23a
2020-06-05 16:10:24 +02:00
Celine Mercier
687e42ad22
C: kmer alignment: fixed a bug where scores of 0 were at
...
(0+kmer_length-1) (and now setting alignment direction to None if score
is 0
2020-06-05 16:09:33 +02:00
Celine Mercier
5fbbb6d304
alignpairedend: fixed a bug when rebuilding joined (unaligned) sequences
...
where only the forward sequence was kept
2020-06-05 16:06:43 +02:00
Celine Mercier
359a9fe237
Switch to version 3.0.0b23
2020-06-04 15:35:03 +02:00
Celine Mercier
f9b6851f75
Python: correctly flagged some mandatory options as required
2020-06-04 15:34:24 +02:00
cmercier
29a2652bbf
Fixed installation on Ubuntu without pip
2020-06-04 15:06:35 +02:00
Celine Mercier
2a2c233936
obi import: fixed a bug when skipping an entry
2020-05-29 21:19:42 +02:00
Celine Mercier
faf8ea9d86
Switch to version 3.0.0b21
2020-05-28 20:42:09 +02:00
Celine Mercier
ffe2485e94
Genbank parser: now reading ORIGIN lines with comments without
...
triggering error
2020-05-28 20:41:34 +02:00
Celine Mercier
6094ce2bbc
obi import: skip on error more robust
2020-05-28 20:40:36 +02:00
Celine Mercier
a7dcf16c06
Minor changes for pip release
2020-05-20 15:59:04 +02:00
Celine Mercier
f13f8f6165
obi import: minor doc/display improvements
2020-05-20 11:46:29 +02:00
Celine Mercier
b5a29ac413
Switch to version 3.0.0b19
2020-05-20 10:29:36 +02:00
Celine Mercier
efd2b9d338
Cleaner installation
2020-05-20 10:29:12 +02:00
Celine Mercier
ca6e3e7aad
obi import: fixed to work with seq genbank extension
2020-05-20 10:28:14 +02:00
Celine Mercier
76ed8e18e5
Switch to version 3.0.0b18 with version formatting that fits setuptools
2020-05-18 17:08:55 +02:00
Celine Mercier
1d17f28aec
setup: now using setuptools instead of distutils to work with pip
2020-05-18 17:08:09 +02:00
Celine Mercier
fa834e4b8b
obi import: small bug fix
2020-05-18 17:06:58 +02:00
Celine Mercier
a72fea3cc9
Python: fasta parser: fixed a bug stopping the program when the last
...
line contained a single nucleotide
2020-05-12 11:24:12 +02:00
Celine Mercier
e9a37d8a6e
Switch to version 3.0.0-beta16
2020-05-07 17:09:26 +02:00
Celine Mercier
ef074f8455
typo
2020-05-07 17:08:59 +02:00
Celine Mercier
aec5e69f2c
C, views: no more automatic COUNT column if MERGED_sample column exists
2020-05-07 17:08:07 +02:00
Celine Mercier
170ef3f1ba
Views: added obi prefix to commands in bash history
2020-05-07 17:07:01 +02:00
Celine Mercier
f999946582
obi uniq: fixed the remerging of already merged informations, and
...
efficiency improvements
2020-05-07 17:05:54 +02:00
Celine Mercier
773b36ec37
obi import: fixed the import of old obitools files with premerged
...
informations, and other minor improvements
2020-05-07 17:03:04 +02:00
Celine Mercier
69cb434a6c
version 3.0.0-beta15c
2020-04-29 14:25:33 +02:00
Celine Mercier
55d4f98d60
obi annotate: fixed annotation at ranks
2020-04-29 14:24:40 +02:00
Celine Mercier
0bec2631e8
ecotag: fixed a bug where all the full DMS path weren't properly sent to
...
the C layer
2020-04-29 10:35:55 +02:00
Celine Mercier
e6b6c6fa84
AVLs: Made an error message more informative
2020-04-29 10:14:04 +02:00
Celine Mercier
974528b2e6
build_ref_db: fixed bug erasing some of the higher LCAs (i.e. lowest
...
similarities)
2020-04-28 15:56:06 +02:00
Celine Mercier
1b346b54f9
ecotag: better specificity by now correctly looking for similarities
...
within refs above best score instead of ecotag threshold
2020-04-28 15:10:07 +02:00
Celine Mercier
058f2ad8b3
ecopcr: fixed a bug where sequences were considered circular (generating
...
false positives)
2020-04-27 14:44:35 +02:00
Celine Mercier
60bfd3ae8d
obi annotate: now defaults to setting str if expression is not valid
2020-04-24 11:35:20 +02:00
Celine Mercier
67bdee105a
C: build_ref_db: added progress display for each step
2020-04-18 14:24:08 +02:00
Celine Mercier
0f745e0113
C: Columns: optimizing column file growth
2020-04-18 13:55:47 +02:00
cmercier
da8de52ba4
export: fixed progress bar bug
2020-04-17 15:09:10 +02:00
cmercier
4d36538c6e
C: SSE lcs alignment: band-aid for memory bug I don't understand
...
(triggered on specific db on ubuntu)
2020-04-17 15:07:52 +02:00
Celine Mercier
8d0b17d87d
Switch to version 3.0.0-beta14
2020-04-15 17:47:26 +02:00
Celine Mercier
343999a627
Taxonomy: fixed a critical memory bug when building the list of merged
...
taxids
2020-04-15 17:46:13 +02:00
Celine Mercier
e9a40630e9
C: Columns: rounding column growth to ceil to avoid looping on small
...
values
2020-04-13 19:02:10 +02:00
Celine Mercier
8dbcd3025a
C: Columns: reduced column growth factor from 2 to 1.3 to avoid errno28
2020-04-13 14:47:56 +02:00
Celine Mercier
4cf635d001
Switch to version 3.0.0-beta13
2020-04-12 17:42:58 +02:00
Celine Mercier
b7e7cc232a
Made completion script cleaner
2020-04-12 17:41:59 +02:00
Celine Mercier
b6ab792ceb
C: made error message more detailed when checking that sequences and
...
qualities match
2020-04-12 17:40:24 +02:00
Celine Mercier
ddea5a2964
obi import: fixed inconsequential error when precomputing number of
...
entries in some formats
2020-04-12 17:38:42 +02:00
Celine Mercier
30852ab7d5
View bash history: removed useless shebang
2020-04-12 17:36:04 +02:00
Celine Mercier
4d0299904e
all commands (almost): cleaner DMS closing at the end
2020-04-12 17:31:58 +02:00
Celine Mercier
eef5156d95
obi stats: fixed error when printing bool keys
2020-04-12 17:12:04 +02:00
Celine Mercier
e62c991bbc
goes with previous commit
2020-04-10 11:22:26 +02:00
Celine Mercier
1218eed7fd
ecopcr: now printing a warning instead of interrupting with an error
...
when a taxid is not found
2020-04-10 11:22:04 +02:00
Celine Mercier
cd9cea8c97
obi import: fixed critical bug where the last entry of embl and genbank
...
files was not imported
2020-04-09 19:26:27 +02:00
Celine Mercier
98cfb70d73
ecopcr: made some errors more informative
2020-04-09 09:15:28 +02:00
Celine Mercier
b9f68c76c8
ecopcr: added warnings and check of primer length (related to #75 )
2020-04-05 18:40:56 +02:00
Celine Mercier
0b98371688
ngsfilter: added warning about primer length in -h ( #75 )
2020-04-05 18:39:20 +02:00
Celine Mercier
f0d152fcbd
ngsfilter: now checking primer length ( fixes #75 )
2020-04-05 18:29:10 +02:00
Celine Mercier
8019dee68e
ecotag: now closing all DMS properly
2020-04-05 13:20:49 +02:00
Celine Mercier
0b4a234671
Swich to version 3.0.0-beta11
2020-02-12 14:23:42 +01:00
Celine Mercier
d32cfdcce5
ecotag: fixed the generated column comments formatting that would
...
generate errors
2020-02-12 14:23:17 +01:00
Celine Mercier
219c0d6fdc
obi cat: Fixed the handling when concatenating views with dictionaries
...
having different key sets
2020-02-12 14:21:39 +01:00
Celine Mercier
dc9f897917
switch to version 3.0.0-beta10
2020-02-02 21:15:27 +01:00
Celine Mercier
bb72682f7d
obi import: new option --preread to do a first readthrough of the
...
dataset if it contains huge dictionaries for a much faster import.
2020-02-02 21:12:34 +01:00
Celine Mercier
52920c3c71
URI decoding: dirty temp fix for bug where default dms makes a mess when
...
should guess file
2020-02-02 21:11:05 +01:00
Celine Mercier
18c22cecf9
switch to version 3.0.0-beta9
2020-02-01 15:48:55 +01:00
Celine Mercier
1bfb96023c
obi import: rewriting a column now deletes the old one to save disk
...
space
2020-02-01 15:31:14 +01:00
Celine Mercier
c67d668989
obi import: fixed a bug when the first entry would contain a dictionary
...
with one key. Switch to beta8
2020-01-29 20:23:39 +01:00
Celine Mercier
db0ac37d41
switch to version 3.0.0-beta7
2020-01-29 16:18:53 +01:00
Celine Mercier
d0c21ecd39
Removed an OpenMP clause that was not obligatory and triggered a known
...
gcc bug involving macros
2020-01-24 16:00:53 +01:00
Celine Mercier
53212168a2
History: added 'obi' in bash history for practical reasons
2020-01-23 16:51:49 +01:00
Celine Mercier
b4b2e62195
Cleaner handling of reverse quality columns
2020-01-18 19:28:12 +01:00
Celine Mercier
ced82c4242
Switching to version 3.0-beta6
2020-01-18 17:29:23 +01:00
Celine Mercier
a524f8829e
New command: obi cat to concatenate views (not optimized yet)
2020-01-18 17:28:31 +01:00
Celine Mercier
5c9091e9eb
C: closing DMS after cleaning it instead of counting on upper layer
2020-01-18 17:27:35 +01:00
Celine Mercier
822000cb70
Fixes in documentation
2020-01-18 17:26:18 +01:00
Celine Mercier
b9cd9bee9a
C: Changed obibool definitions because of conflict with R
2020-01-06 15:11:31 +01:00
Celine Mercier
b1f3e082f9
ngsfilter: fixed a bug when there is only one tag introduced in latest
...
edit
2020-01-06 13:53:38 +01:00
Celine Mercier
6c018b403c
ecopcr: fixed and improved the options to keep nuclotides around the
...
amplicon
2019-12-26 20:45:54 +01:00
Celine Mercier
694d1934a8
Tagging version beta3
2019-12-12 17:03:13 +01:00
Celine Mercier
fc3ac03630
clean_dms: now works with extension
2019-12-12 17:02:50 +01:00
Celine Mercier
d75e54a078
uniq: added forced deletion of reverse sequence quality
2019-12-12 17:02:36 +01:00
Celine Mercier
6bfd7441f3
ngsfilter: fixed sequence cutting when dealing with unaligned sequences.
...
Could use optimization
2019-12-12 17:01:31 +01:00
Celine Mercier
81a179239c
ngsfilter: fixed sequence cut bug on aligned sequences. Still exists for
...
unaligned sequences
2019-12-10 18:13:27 +01:00
Celine Mercier
35ce37c0f7
ngsfilter: fixed a bug with unaligned chimeras (unpaired primers) and
...
made error annotations more explicit
2019-12-10 13:43:32 +01:00
Celine Mercier
53f18316b0
ngsfilter: made more robust and practical to use with empty tags
2019-11-29 15:21:08 +01:00
Celine Mercier
8bc249b2f4
Version 3.0.0-beta1
2019-09-27 14:52:05 +02:00
Celine Mercier
e308c2e822
versioning 1.0.beta
2019-09-26 21:05:05 +02:00
Celine Mercier
3b3cf9359d
CMake: unset gcc for nix
2019-09-26 21:04:42 +02:00
Celine Mercier
be85c55c9e
Python: URIs: fixed bug on linux systems
2019-09-25 14:41:52 +02:00
Celine Mercier
6d5b904888
Cleaning
2019-09-25 11:58:00 +02:00
Celine Mercier
50e8374f6f
Added website URL in readme file
2019-09-25 11:40:00 +02:00
Celine Mercier
6282242a04
C: Views: fixed a bug when trying to add a comment after changing the
...
file name of a finished view
2019-09-25 11:39:32 +02:00
Celine Mercier
44517db51f
Fixed gcc warnings
2019-09-25 11:38:00 +02:00
Celine Mercier
c3b9e46291
more cleaning
2019-09-24 13:58:53 +02:00
Celine Mercier
28b7fce59a
Cython API: simpler column repr display
2019-09-22 20:23:31 +02:00
Celine Mercier
fa9555deb9
obi stats: fixed bug with None values
2019-09-22 20:21:53 +02:00
Celine Mercier
d30f7e7317
more cleaning
2019-09-22 18:52:05 +02:00
Celine Mercier
4fa38d9886
cleaning
2019-09-22 17:38:28 +02:00
Celine Mercier
71276537a6
obi import: fixed bug when importing a taxdump
2019-09-22 16:45:30 +02:00
Celine Mercier
ba9ba7aa60
obi grep: now able to convert str to bytes in predicate expressions
2019-09-22 16:44:45 +02:00
Celine Mercier
7b4046c288
Bash completion script for commands, dms and views
2019-09-21 23:46:08 +02:00
Celine Mercier
e2ba76002a
Cleaned setup script and put to my name ;)
2019-09-21 23:44:24 +02:00
Celine Mercier
336100f716
obi less: now actually behaves like less
2019-09-21 18:29:12 +02:00
Celine Mercier
d83398c0e0
Cython: View: lines from simple View instances are now displayed in tab
...
instead of dict format
2019-09-21 18:28:56 +02:00
Celine Mercier
974d25b815
Cython: Fixed bug in tab formatter with header option always being set
...
to true
2019-09-21 18:27:47 +02:00
Celine Mercier
ec0737a600
Added signal catching and handling in C and Cython
2019-09-21 16:47:22 +02:00
Celine Mercier
06f9d6da60
obi import: importing a view to a DMS now uses the C API (more efficient
...
and imports all metadata)
2019-09-21 12:49:29 +02:00
Celine Mercier
f0f7edf152
Python API: small option improvements
2019-09-21 12:08:36 +02:00
Celine Mercier
9e72c8d16a
obi ls: improved taxonomy list
2019-09-20 20:46:33 +02:00
Celine Mercier
7c3fa14789
obi import: fixed bug when reading output URI
2019-09-20 20:43:48 +02:00
Celine Mercier
ec874c095b
new command: clean_dms to clean and unlock a DMS after a bad exit.
2019-09-20 20:38:25 +02:00
Celine Mercier
783a1343c4
DMS are now locked when used by a command. Added checks and changed
...
cleaning mechanisms.
2019-09-20 20:37:19 +02:00
Celine Mercier
eb6c59dc1e
obi import: proper check for taxonomy name already existing in DMS when
...
importing a taxdump
2019-09-17 13:41:49 +02:00
Celine Mercier
ad46056179
obi export: if export format is not specified, it is guessed from the
...
view type
2019-09-17 13:22:41 +02:00
Celine Mercier
9063e9159d
Export options: output option is now only non-positional for obi export
2019-09-17 13:19:17 +02:00
Celine Mercier
0159385943
URI decoding: fixed bug with dms-only URI
2019-09-17 12:50:37 +02:00
Celine Mercier
a0c8deb806
obi export: made output to stdout and pipe in less possible
2019-09-17 12:31:03 +02:00
Celine Mercier
f566618be6
Added option for no progress bar and made output URI option non
...
positional (for stdout output)
2019-09-17 12:29:33 +02:00
Celine Mercier
88451116e8
URIs: added stdout output (empty URI)
2019-09-17 12:28:10 +02:00
Celine Mercier
eb913b2742
ecotag: trying to use a threshold lower than the ref db threshold now
...
returns an error instead of a warning
2019-09-15 19:27:47 +02:00
Celine Mercier
f8d1fa678a
obi stats: improved display with str instead of bytes
2019-09-10 16:20:36 +02:00
Celine Mercier
bc55c5ef8c
obi clean: fixed an openmp bug where the share size would be 0 blocking
...
the program
2019-09-10 15:37:33 +02:00
Celine Mercier
f3b0e10c7f
fixed a comment
2019-09-10 14:42:12 +02:00
Celine Mercier
8f9f2a2d10
obi ls: various improvements
2019-09-10 14:41:43 +02:00
Celine Mercier
045a751b0f
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2019-09-05 17:20:13 +02:00
Celine Mercier
ad3a72597f
Little fixes for linux compilation
2019-09-05 17:19:29 +02:00
Celine Mercier
8899478237
Update README.md
2019-09-04 17:29:45 +02:00
Celine Mercier
ec614e5d15
Update README.md
2019-09-04 17:23:30 +02:00
Celine Mercier
f8cccebe19
Update README.md
2019-09-04 17:11:46 +02:00
Celine Mercier
5e3c41b058
C: Fixed opened DIR leak
2019-09-04 16:48:13 +02:00
Celine Mercier
b3a1011d36
C: fixed a bug when opening or creating a new column directory where the
...
DMS was not saved in the struct
2019-09-04 13:16:28 +02:00
Celine Mercier
a7fabff1c7
C: made it so column DIR* are not kept open to handle very large DMS
2019-09-04 12:55:21 +02:00
Celine Mercier
f296517716
Various display improvements
2019-09-03 21:46:39 +02:00
Celine Mercier
d491480af2
C: fixed remaining memory bug in array indexer
2019-09-01 17:24:57 +02:00
Celine Mercier
073d98db08
C: ecotag: now prints a warning if the demanded threshold is lower than
...
the db threshold
2019-08-31 18:30:06 +02:00
Celine Mercier
0ee728c4d0
C: build_ref_db: now adds a comment with the threshold used to build the
...
DB
2019-08-31 18:29:40 +02:00
Celine Mercier
7423bacac0
C: Json comments: added an obi_read_comment function to read one value
...
from comments
2019-08-31 18:28:51 +02:00
Celine Mercier
53dcbc8ea3
Fixed log to be in str instead of bytes
2019-08-29 18:26:51 +02:00
Celine Mercier
4e75514bad
obi import: fixed entry count
2019-08-29 18:26:09 +02:00
Celine Mercier
1ed2d45ac4
obi grep: made an error message clearer (error could be eventually be
...
handled by program, looking for str in bytes returned by a column)
2019-08-29 17:17:52 +02:00
Celine Mercier
e43e49d6f1
C: optimized dir opening
2019-08-29 16:35:10 +02:00
Celine Mercier
187053026f
Better detection of missing taxonomy
2019-08-29 16:10:09 +02:00
Celine Mercier
dcf8cf1d64
Improved obi stats
2019-08-29 15:18:26 +02:00
Celine Mercier
3cfe3a9b00
Improved progress display when importing files in a DMS
2019-08-29 10:12:06 +02:00
Celine Mercier
728af51cb2
Python: better display of tuple values in fasta format
2019-08-28 15:55:36 +02:00
Celine Mercier
99a397b842
obi uniq: various improvements and fixes #66
2019-08-27 20:27:36 +02:00
Celine Mercier
f5c472ffd1
C: fixed a memory bug in the array indexer
2019-08-27 20:26:46 +02:00
Celine Mercier
580db2f710
minor comment
2019-08-27 20:25:54 +02:00
Celine Mercier
dbe09f83a2
Increased the threshold of elements per line in a column before they are
...
stored as a character string
2019-08-27 20:25:14 +02:00
Celine Mercier
3d1b2e8ed9
Better handling of column lines with all values at NA
2019-08-27 20:20:26 +02:00
Celine Mercier
ae5f42c260
fixes #61 : now reading merged taxids information when building a
...
reference database
2019-08-19 12:30:56 +02:00
Celine Mercier
af7cecf59f
Fixed a bug where a directory was not closed properly resulting in errno
...
24 sometimes
2019-08-18 19:46:52 +02:00
Celine Mercier
5f20be44b2
Minor fixes
2019-08-18 19:45:53 +02:00
Celine Mercier
66441e0aef
Fixed a bug when sending a DMS path to a C function from Cython
2019-08-18 19:43:51 +02:00
Celine Mercier
13952358b3
Fixed a bug where some commands wouldn't work if the input DMS was not
...
in the current directory
2019-07-25 11:59:19 +02:00
Celine Mercier
9f38cd8cf6
updated a comment
2019-07-23 19:03:24 +02:00
Celine Mercier
946f9723b8
ecotag: fixed a bug where the wrong taxid for the best match was
...
retrieved
2019-07-23 19:02:17 +02:00
Celine Mercier
9752ff8494
embl parser: information display about progress when parsing multiple
...
files
2019-07-23 18:59:07 +02:00
Celine Mercier
d99702f56f
ngsfilter and alignpairedend: paired-end reads are now correctly
...
reversed and labeled to be aligned correctly by alignpairedend
2019-07-23 18:56:51 +02:00
Celine Mercier
1759302829
C: ecotag: fixed 2 memory bugs
2019-07-06 16:31:19 +02:00
Celine Mercier
86bfa96fbe
C: kmer similarity: small improvements
2019-07-06 16:30:32 +02:00
Celine Mercier
f765c6f41e
obi alignpairedend: fixed a bug where first seq was kept in result view
...
instead of consensus seq
2019-07-06 16:29:32 +02:00
Celine Mercier
a83bf43ab9
obi stats: result display is now sorted
2019-07-06 16:27:51 +02:00
Celine Mercier
3d9f0352ff
obiclean parallelized
2019-06-20 19:44:04 +02:00
Celine Mercier
9b4c3537f9
multithreaded obiclean working but not cleaned
2019-06-19 17:29:58 +02:00
Celine Mercier
fd0b7a9177
j loop with critical (untested)
2019-06-04 17:14:36 +02:00
Celine Mercier
debf59b266
i loop parallelized: bad
2019-05-25 18:37:56 +02:00
Celine Mercier
a04588da31
openmp on j loop (i loop probably better)
2019-05-24 16:51:04 +02:00
Celine Mercier
ed5bb70c80
CMake: setting compiler higher to avoid conflicts, and linking libopenmp
2019-05-22 16:26:30 +02:00
Celine Mercier
22a5ae72d1
obi clean: not using tsearch library anymore, a simple byte array
...
instead. A lot more time and memory efficient. Closes #67
2019-05-19 17:39:53 +02:00
dc88181eeb
Add a --cobitools3 options to setup.py
2019-04-12 14:55:05 +02:00
2f60e91d93
Comment the install of the packages
2019-04-12 13:03:53 +02:00
7ba27b6a99
Ask for python 3.7
2019-04-01 09:08:27 +02:00
d3937e1051
Add the cmakefile to the manifest
2019-04-01 09:01:45 +02:00
35eeb07f08
Build the C src in build/cobject
2019-04-01 08:52:38 +02:00
Celine Mercier
3afbbeb7e5
CMake: made required version 3.10 for ubuntu
2019-03-31 16:54:05 +02:00
Celine Mercier
d6056a8e50
dirty temporary fix for install
2019-03-31 16:19:05 +02:00
Celine Mercier
ac47bdce5d
history: fixed DMS history when multiple inputs
2019-03-31 15:44:20 +02:00
Celine Mercier
7f8d1e7196
C: obi lcs: cleaner progress print
2019-03-31 15:42:58 +02:00
Celine Mercier
80068a3c19
ngsfilter: fixed parsing error
2019-03-31 15:42:30 +02:00
Celine Mercier
a3e6b7d913
obi import: fixed import of View_NUC_SEQS to another DMS
2019-03-31 15:42:07 +02:00
Celine Mercier
416c2d7ba0
Cython: made fasta formatter cleaner
2019-03-31 15:41:32 +02:00
Celine Mercier
26fb149efb
C: made build_ref_db cleaner
2019-03-31 15:40:13 +02:00
Celine Mercier
2b8c066f8e
Cython: added possibility to output in tabular format
2019-03-31 15:39:38 +02:00
Celine Mercier
e39c1a7fbf
Cython: added tab formatter and parser (for obi export)
2019-03-31 15:38:34 +02:00
Celine Mercier
6841d879aa
obi history: fixed a bug when displaying ascii history
2019-03-31 10:51:52 +02:00
Celine Mercier
f0ff585455
Removing trace
2019-03-30 20:52:54 +01:00
Celine Mercier
601a2cfd7d
obi uniq: various fixes...
2019-03-30 20:34:53 +01:00
Celine Mercier
7c518300a0
C: Views: fixed a bug when creating automatic columns with unformatted
...
comments
2019-03-30 20:33:14 +01:00
Celine Mercier
f16bbca8e2
obi grep: fixed a bug where -p option didn't work
2019-03-30 19:10:42 +01:00
Celine Mercier
173483448a
Merge commit '3d842ff7'
2019-03-30 15:29:52 +01:00
Celine Mercier
52b3a9fc39
C: taxonomy: fixed a segfault on linux when trying to fclose an unopened
...
file
2019-03-30 15:19:12 +01:00
Celine Mercier
ce686e9569
obi import: progress bar fixed when using --only option
2019-03-30 15:16:57 +01:00
Celine Mercier
c293cfabbb
Python: embl parser: fixed a bug preventing taxids from being parsed
2019-03-30 15:15:49 +01:00
Celine Mercier
0847d618d6
fixed typo
2019-03-30 15:14:30 +01:00
Celine Mercier
9fcebd7643
C: build_reference_db: made some errors more explicit
2019-03-30 15:11:49 +01:00
5d842ff7e7
Clean the manifest of old files
2019-03-29 16:58:45 +01:00
3445579251
remove all the no more needed .cfiles
2019-03-29 16:56:58 +01:00
995a66b488
Add the new script emplacement
2019-03-29 16:55:23 +01:00
5007b02cbc
cleaning stage 2
2019-03-29 16:46:17 +01:00
cdd5975e8b
Cleaning first stage
2019-03-29 16:40:36 +01:00
0c466046f4
Merge branch 'pip-standard-orig-python' into 'master'
...
The new install version based on classical setup.py
See merge request obitools/obitools3!1
2019-03-29 16:25:01 +01:00
2774422224
Patch the way of installing the obi main command
2019-03-29 16:21:28 +01:00
bf62960ee8
Add some .ignore files
2019-03-29 15:52:54 +01:00
9c41b1e9da
Move and rename the obi.py script
2019-03-29 15:45:38 +01:00
3a6d1be795
remove the old distutils
2019-03-29 15:42:45 +01:00
6c52966033
Switch back to the original python source from the paster branch
2019-03-29 15:24:31 +01:00
460187970f
First version compiling the code correctly
2019-03-29 15:22:10 +01:00
52b8008bdc
Add the location of install
2019-03-29 15:21:30 +01:00
6b9da38087
patch some relative imports
2019-03-29 15:19:44 +01:00
Celine Mercier
ee9947217c
alignpairedend: fixed the worst memory leak and the handling of the case
...
where 0 common kmers are found
2019-03-29 11:16:25 +01:00
Celine Mercier
ceaafca427
ngsfilter: fixed a bug (maybe 2) in the algo for the choice of the
...
reverse primer when running on unaligned sequences
2019-03-29 10:56:17 +01:00
Celine Mercier
7c2787b6b3
trying to fix cython difficulties
2019-03-26 16:19:55 +01:00
14eca43eac
Import taxo
2019-03-26 16:17:44 +01:00
0b4ea49539
Convert relative import an delete cfiles
2019-03-26 16:14:03 +01:00
cd88c37a7e
Merge branch 'pip-standard' of git@git.metabarcoding.org:obitools/obitools3.git into pip-standard
2019-03-26 15:54:49 +01:00
1095a617a3
Patch relative import to absolute
2019-03-26 15:54:33 +01:00
Celine Mercier
5a05258fcb
fixed relative cython imports to be absolute
2019-03-26 15:52:59 +01:00
10ab557259
First version of the simplified setup.py script
2019-03-26 15:40:31 +01:00
Celine Mercier
8e70bf1ee1
obi import: fixed bug when rewriting a column (keeping wrong type in
...
import module)
2019-03-26 14:56:18 +01:00
Celine Mercier
d8a7bd42bd
Cython API, taxonomy: fixed parental tree iterator (skipped second to
...
last taxon, in OBI1 too)
2019-03-26 14:08:54 +01:00
Celine Mercier
06178d9d61
Genbank file parser functions that should have been included in a
...
previous commit
2019-03-20 11:44:43 +01:00
Celine Mercier
3abe1b7ace
obi_errno_to_exception function now properly reads obi_errno global
...
variable directly
2019-03-20 11:43:12 +01:00
Celine Mercier
802a3f5933
data import: entries now counted if there are multiple files
2019-03-18 18:16:39 +01:00
Celine Mercier
7e20870719
Added genbank parser
2019-03-15 16:06:27 +01:00
Celine Mercier
e8090a44c9
Fixed the ultimate bug with embl (and genbank) parsers: raising any
...
exception in a python generator makes it unable to resume. So now,
exceptions are not raised but printed, then functions return None and
that's handled at higher level.
2019-03-15 16:06:06 +01:00
Celine Mercier
832f582802
Fixed no-skip-on-error option :p
2019-03-15 16:04:04 +01:00
Celine Mercier
58d0c850c2
Made skip on error option True by default......
2019-03-15 15:50:40 +01:00
Celine Mercier
7737211ac2
Small fix in embl and genbank features parser
2019-03-15 15:50:11 +01:00
Celine Mercier
c953f0cb00
Fixed embl import where sequences were not imported as Nuc_Seq objects
2019-03-15 11:41:07 +01:00
Celine Mercier
bb045c3ae9
added TAXID_COLUMN to C API declarations for Cython
2019-03-15 11:40:06 +01:00
Celine Mercier
2a4f1b8feb
obi import: now properly uses macros for column names
2019-03-15 11:39:21 +01:00
Celine Mercier
24a63f8732
URIs: URIs built with autocomplete now work too
2019-03-15 10:52:27 +01:00
Celine Mercier
478d19ab43
Cleaner stderr prints
2019-03-13 18:36:31 +01:00
Celine Mercier
e3c565d6be
Cleaner progress bar
2019-03-13 18:36:05 +01:00
Celine Mercier
d88390c6d8
Cython API: when importing a file in a DMS, its length is computed
...
beforehand for the progress bar
2019-03-13 18:35:32 +01:00
Celine Mercier
50e7cd61a6
added math.h import where needed
2019-03-13 11:17:25 +01:00
Celine Mercier
49d5f6fb1e
removed deprecated comment
2019-03-13 11:17:04 +01:00
Celine Mercier
b45c2ee653
Cython API: cleaner column rewriting API
2019-03-13 11:13:55 +01:00
Celine Mercier
6afd1294a7
Cython API: Views: fixed a bug when rewriting a column with different
...
attributes (last line is not written anymore)
2019-03-12 16:40:30 +01:00
cmercier
a9ba7744cf
obidistutils: added fPIC flag needed for linux compilation and set
...
minimum python version to 3.7
2019-03-12 14:20:59 +01:00
Celine Mercier
185a95e667
cleaner Makefile
2019-03-11 15:20:10 +01:00
Celine Mercier
8835a1a983
removed -R compilaiton flag that gcc doesn't like
2019-03-07 15:55:46 +01:00
Celine Mercier
1ee50b7222
Fixed a bug when creating a column and checking the comments string if
...
it was NULL
2019-03-07 15:09:59 +01:00
Celine Mercier
720bb65b24
Installation: basic Makefile that creates the shared obi3 library used
...
by Cython
2019-03-07 14:01:37 +01:00
Celine Mercier
2a1ab9db29
Cython API, Views: guessing an obitype from a python value is now done
...
through the corresponding functions in utils
2019-03-07 13:57:37 +01:00
Celine Mercier
4bc52c08c2
minor changes
2019-03-07 13:53:37 +01:00
Celine Mercier
306da846e3
obidistutils: link obi3 C shared library instead of compiling all C
...
files with all modules (creating issues with global/static variables).
EXCEPT RUNTIME LINKING DOESN'T WORK YET
2019-03-07 13:50:29 +01:00
Celine Mercier
af57e532da
obidistutils: create doc/sphinx dir if needed
2019-03-07 13:47:23 +01:00
52de6f2717
Update distutils for openmp and new version of pip
2019-02-19 17:30:53 +01:00
29c56572cf
Add cfiles everywhere ;-)
2019-02-19 15:04:30 +01:00
Celine Mercier
de3d12af17
Renamed CAPI file
2019-02-19 14:50:30 +01:00
Celine Mercier
9ccddd5280
better cfiles
2019-02-19 14:11:29 +01:00
Celine Mercier
e026e9ec83
Fixed the new alignpaired end to work after ngsfilter with the 9879847
...
possible cases
2019-02-17 18:32:35 +01:00
Celine Mercier
4ddd1a1c37
embl iterator: only option on embl directories now works as intended
2019-02-12 16:46:08 +01:00
Celine Mercier
3015310535
Fixed a bug in kmer similarity computation where the fact that sequences
...
could be switched was not accounted for
2019-02-10 21:02:24 +01:00
Celine Mercier
08bcbcd357
ngsfilter: reworked to use apat library
2019-02-06 18:13:54 +01:00
Celine Mercier
04a3682307
Cython API: added API to use apat (pattern search) C library
2019-02-06 18:12:49 +01:00
Celine Mercier
6ca6d27ecb
ecoPCR: fixed amplicon length computation bug
2019-02-06 18:11:20 +01:00
Celine Mercier
8f18907566
Cython API: changed revcomp attribute of Nuc_Seq class to is_revcomp to
...
be more explicit
2019-02-06 18:09:11 +01:00
Celine Mercier
0b62619e4e
Various commentaries and insignificant fixes
2019-01-21 17:32:44 +01:00
Celine Mercier
c7f5b8d980
Alignpairedend: added alignment using shifting with best kmer similarity
...
(low level layer in C and Cython API)
2019-01-21 17:30:46 +01:00
Celine Mercier
59017c0d6b
C: taxonomy: fixed a bug when checking for root node
2019-01-21 17:23:25 +01:00
Celine Mercier
9f6bba183f
C: Added a function to get a nucleotide at a specific index in an
...
encoded sequence
2019-01-21 17:18:02 +01:00
Celine Mercier
2a6a112d29
obi import: fixed writing quality in views when appropriate (but still
...
not a satisfying solution)
2018-12-11 19:33:55 +01:00
Celine Mercier
c437931a35
Cython: fixed history dot graph for all views, and fixed history
...
recording for build_ref_db and ecotag
2018-12-10 17:09:00 +01:00
Celine Mercier
eb586b2f53
New command and C functions: obi ecotag
2018-12-09 19:19:32 +01:00
Celine Mercier
9556130b11
C obi_lcs: updated deprecated column names and associated comments
2018-12-09 19:17:13 +01:00
Celine Mercier
005aaeec06
C obi_lcs: fixed checking for identical sequences when aligning 2
...
columns
2018-12-09 19:16:44 +01:00
Celine Mercier
579f56bb54
obi align (pouic): fixed bug with the saved config when aligning 2
...
different views
2018-12-09 19:15:58 +01:00
Celine Mercier
da445066f3
C alignment filter: added a check for sequences not being equal when the
...
threshold requires that they are
2018-12-09 19:14:51 +01:00
Celine Mercier
0a407436da
C Views: made an error message more specific
2018-12-09 19:14:05 +01:00
Celine Mercier
54efff36c4
C build ref db: fixed 2 bugs when setting arrays: size of an element in
...
in bits not bytes and using view API instead of column API
2018-12-09 19:13:06 +01:00
Celine Mercier
6acb21712a
Missing commit for build_ref_db: C API file for cython
2018-12-09 19:11:59 +01:00
Celine Mercier
12087a6c3a
C, views: made 'view_exists' function public (now 'obi_view_exists')
2018-11-27 16:20:30 +01:00
Celine Mercier
fbabbceb5a
Fixed a bug in the array indexer where the value's length was no
...
properly set to 0 if the value was NA (ignore previous commit with the
same message)
2018-11-27 16:18:34 +01:00
Celine Mercier
6f27734d71
Cython: fxed a bug in INT tuple columns where values were converted to
...
double instead of int
2018-11-27 16:14:56 +01:00
Celine Mercier
b3bfa9ca65
Fixed a bug in the array indexer where the value's length was not
...
properly set to 0 if the value was NA
2018-11-27 16:12:41 +01:00
Celine Mercier
ece942e771
new command: build_ref_db to build a reference database with metadata
...
for the taxonomic assignment of sequences
2018-11-27 16:11:18 +01:00
Celine Mercier
ef8dc85f3c
C, taxonomy: new function to get the lowest common ancestor of two taxa
2018-11-27 16:00:29 +01:00
Celine Mercier
f942dd856f
C: new function to build a reference database with LCA and score
...
metadata for the taxonomic assignment of sequences
2018-11-27 15:56:50 +01:00
Celine Mercier
730ea99f85
minor fixes and comments
2018-11-19 11:23:54 +01:00
Celine Mercier
4d51f4f015
obi import: better checking of whether to import quality
2018-11-19 11:23:39 +01:00
Celine Mercier
e9c1d5e48d
AVLs: made maximum number of nodes per AVL 5 millions, as this combined
...
with keeping all AVLs mapped seems the most efficient. Now 1 million
sequences more or less constantly takes 1 minute.
2018-11-19 11:22:26 +01:00
Celine Mercier
7fc1b578cf
AVLs: AVLs in a group are not unmapped and remapped constantly anymore
...
when adding new values, fixed a bug when calculating if an AVL data file
has reached the maximum size, fixed a casting bug, and added a boolean
so read-only AVLs files are not truncated
2018-11-19 11:19:07 +01:00
Celine Mercier
31053591b5
Fixed 2 bugs when checking qualities matching sequences predicate: now
...
closing and reopening indexers so that they are mapped properly, and
fixed memory leak when reading sequences
2018-11-19 11:05:53 +01:00
Celine Mercier
b0da36cb48
New command: obi align, except it's called obi pouic for now because of
...
a Cython compilation bug
2018-11-07 16:05:48 +01:00
Celine Mercier
d1f1fd432e
Minor fixes
2018-11-07 16:04:17 +01:00
Celine Mercier
75a28929a7
Renamed Cython alignment library in an attempt to limit some compilation
...
bugs potentially involving name conflicts
2018-11-07 16:03:32 +01:00
Celine Mercier
d076ea9900
Alignment: updated functions to align columns (LCS)
2018-11-07 16:00:58 +01:00
Celine Mercier
6b1c41f3fb
Changed an error message to be more specific
2018-11-07 13:37:25 +01:00
Celine Mercier
362df50fe9
Removed a deprecated element from the DMS structure
2018-11-07 13:36:08 +01:00
Celine Mercier
b1090574da
View import: associated column informations are now correctly updated
...
with the new versions
2018-11-07 13:35:11 +01:00
Celine Mercier
8faabd3ebf
Cython, URI: Fixed a bug when using an output URI with just a view name
...
to use the default DMS
2018-11-02 19:04:27 +01:00
Celine Mercier
35f3e7c30b
All commands now handle outputing to another DMS + small fixes
2018-11-02 19:03:09 +01:00
Celine Mercier
8a8e9e50b2
Fixed declaration going with previous commit
2018-10-31 18:01:04 +01:00
Celine Mercier
c7ff53b948
obi clean: temporary views are now deleted
2018-10-31 17:52:51 +01:00
Celine Mercier
1b7bccb236
Small improvement when checking if a view exists
2018-10-31 17:51:10 +01:00
Celine Mercier
d09aa43133
Cython API: added a function to get the full path to the DMS directory
2018-10-31 14:46:25 +01:00
Celine Mercier
123e5dc0ac
Cython URI API: added an argument to only open the DMS and return the
...
rest as a character string
2018-10-31 14:45:17 +01:00
Celine Mercier
320561a582
Views: Added argument to not automatically create default columns in
...
typed views, a function to delete a view and fixed view history bug
2018-10-31 14:38:05 +01:00
Celine Mercier
92c0fbc9bf
Fixed a bug where an imported column was not flagged as finished,
...
resulting in its deletion when reopening the DMS.
2018-10-29 17:39:30 +01:00
Celine Mercier
b11d52d630
Fixed a bug with the DMS counter being wrongly initialized to 0 instead
...
of 1 (generating memory bugs when using the counter)
2018-10-29 16:12:37 +01:00
Celine Mercier
6305282305
obi clean: made more efficient with arrays (speed ~x15 compared with
...
OBI1)
2018-10-21 17:59:02 +02:00
Celine Mercier
d53323e7f4
Fixed comments bug with obi head and obi tail
2018-10-21 17:39:17 +02:00
Celine Mercier
e18b762d81
Weird buggy Eclipse commit with nothing changed
2018-10-21 17:35:18 +02:00
Celine Mercier
0a0f0682a9
Better handling of errors and exceptions when new view name already
...
exists
2018-10-17 19:47:40 +02:00
Celine Mercier
4802e32f72
Cython: Sequence objects: repr() method now returns a Fasta or Fastq
...
formatted string
2018-10-17 16:53:42 +02:00
Celine Mercier
b027762059
Cython: export: fixed exception raising when no quality data when
...
exporting to fastq
2018-10-17 16:52:51 +02:00
Celine Mercier
da0e3d4043
Cython: added full handling of NA strings when importing files
2018-10-17 16:41:15 +02:00
Celine Mercier
da76f911db
Cython: Views: improved repr() method
2018-10-17 15:54:03 +02:00
Celine Mercier
61ad2deeca
obi uniq: Added line breaks when printing informations to cut progress
...
bar properly
2018-10-17 15:53:28 +02:00
Celine Mercier
eb6d5581bd
Cython: Progress bar: added a cut option to choose whether to do line
...
breaks every tenth of the full bar, set to False by default for lighter
printing
2018-10-17 15:52:26 +02:00
Celine Mercier
343dbc7e4d
Cython: made the logger lighter (now prints just module name instead of
...
full module path)
2018-10-17 15:49:55 +02:00
Celine Mercier
6d018a2d28
Cython: Added 'modulename' in the config informations
2018-10-17 15:47:44 +02:00
Celine Mercier
2c2df4e098
C: Added a trick to suppress compilation warnings about an unused
...
function actually called in a macro
2018-10-17 13:13:23 +02:00
Celine Mercier
8ce6dd6d1a
Updated prototypes with no arguments with a void argument as suggested
...
by compilation warnings
2018-10-17 12:00:40 +02:00
Celine Mercier
df70086384
New command: obi export
2018-10-17 11:27:50 +02:00
Celine Mercier
32d8396ee2
Cython: Added fasta and fastq writers
2018-10-17 11:27:15 +02:00
Celine Mercier
6a8670d24a
Cython: minor fixes
2018-10-17 11:26:13 +02:00
Celine Mercier
ec73fa840a
Cython: obi stats fixed to work with reworked options (forgotten in a
...
previous commit)
2018-10-17 11:25:53 +02:00
Celine Mercier
11032ec90b
Cython: Sequence objects: Quality strings are now returned as bytes
...
instead of str
2018-10-17 11:24:44 +02:00
Celine Mercier
8a9ba8b0a8
Cython: Added Column line methods to get a Column line as a str or
...
bytes, and elements (keys, values) with None values are not returned
anymore
2018-10-17 11:23:07 +02:00
Celine Mercier
135d3b6e67
Cython: updated the URI decoding to handle outputs other than DMS
2018-10-17 11:21:29 +02:00
Celine Mercier
58589e04be
Cython: rearranged input and output format options to have both and
...
updated commands accordingly
2018-10-17 11:19:48 +02:00
Celine Mercier
e6bbe13d81
Cython: fasta and fastq parsers now return bytes and take NA string
...
argument
2018-10-17 11:16:20 +02:00
Celine Mercier
61b00d6013
Cython: fastq formatter
2018-10-09 16:41:14 +02:00
Celine Mercier
8029493c10
Cython: fasta and fastq header formatter
2018-10-09 16:41:00 +02:00
Celine Mercier
aa5ee53478
Cython: fasta writer
2018-10-09 16:40:30 +02:00
Celine Mercier
e31c8ea57a
New command: obi history to print DMS or view history in bash, dot or
...
ascii formats
2018-10-07 19:11:36 +02:00
Celine Mercier
9e700ddc21
obi test: updated to test comments
2018-10-07 19:10:46 +02:00
Celine Mercier
e9a41c5b97
Commands: updated for JSON formatted comments with history
2018-10-07 19:10:34 +02:00
Celine Mercier
35cf2962cc
Cython: DMS: JSON formatted comments and history handling
2018-10-07 19:06:59 +02:00
Celine Mercier
74be3c39f0
Cython: Views: JSON formatted comments and history handling
2018-10-07 19:06:23 +02:00
Celine Mercier
c6ee0bade9
Cython: Columns: goes with handling of JSON formatted comments
2018-10-07 19:04:50 +02:00
Celine Mercier
ffd5bc76bf
Cython utils: functions convert to bytes or str and to remove all empty
...
objects from a complex object
2018-10-07 19:03:38 +02:00
Celine Mercier
704d9b0474
Cython: Columns: added support for JSON formatted comments
2018-10-07 18:59:43 +02:00
Celine Mercier
86bb582a17
Views: implemented handling of JSON formatted comments
2018-10-07 18:56:46 +02:00
Celine Mercier
bc8c394061
Columns: implemented handling of JSON formatted comments
2018-10-07 18:54:51 +02:00
Celine Mercier
cef458f570
Obierrno: added errno for JSON related errors
2018-10-07 18:53:53 +02:00
Celine Mercier
2736a92699
DMS: implemented full information file with JSON formatted comments
2018-10-07 18:53:25 +02:00
Celine Mercier
79f4185757
C library to handle JSON formatted comments using the cJSON library
2018-10-07 18:51:27 +02:00
Celine Mercier
1b6b6d825a
obi grep: added all the missing filtering options
2018-08-14 17:11:41 +02:00
Celine Mercier
3847850a9d
Taxonomy Cython API: added is_ancestor() function
2018-08-14 17:09:40 +02:00
Celine Mercier
b57e938cc4
New command: obi stats
2018-08-13 15:08:10 +02:00
Celine Mercier
2dc7fcceac
Minor fixes
2018-08-10 10:39:46 +02:00
Celine Mercier
e096b929dc
New command: obi tail
2018-08-10 10:39:26 +02:00
Celine Mercier
2c634dae7c
New command: obi head
2018-08-10 10:29:37 +02:00
Celine Mercier
7a4cdc0cfe
New command: obi sort
2018-08-09 18:10:47 +02:00
Celine Mercier
e8dc5eb123
Commands: ngsfilter and alignpairedend can now be used in whichever
...
order
2018-08-08 19:53:26 +02:00
Celine Mercier
3fcf29a76f
More explicit predicate error when checking that sequences and qualities
...
match
2018-08-08 19:51:05 +02:00
Celine Mercier
080a97cccf
Cython API: more explicit "Can't guess type" exception
2018-08-08 19:50:26 +02:00
Celine Mercier
9c9aec2556
Cython API: the associated sequence column for a quality column can now
...
be specified at the Python level
2018-08-08 19:49:56 +02:00
Celine Mercier
303648bd47
Cython: embl file parser
2018-07-28 17:14:10 +02:00
Celine Mercier
2ba6d16147
New command: obi ecopcr
2018-07-28 17:13:45 +02:00
Celine Mercier
275d85dc5d
Cython: fixed a bug when reading an uncompressed file in binary mode
...
where the first 4 characters would not be read
2018-07-28 17:11:51 +02:00
Celine Mercier
a39f9697be
Views: added macro for taxid column name
2018-07-28 17:10:11 +02:00
Celine Mercier
b98880b7fa
Various non-important fixes and comments
2018-07-28 17:07:17 +02:00
Celine Mercier
895d09b133
obi import: 'taxid' columns are imported as 'TAXID' to fit view
...
predicates, and fixed taxdump import and DMS closing
2018-07-28 17:03:00 +02:00
Celine Mercier
c02c15b93f
Cython API: URI decoding now returns the character string with the
...
object path if it could not be opened
2018-07-28 17:00:42 +02:00
Celine Mercier
3e8c187f0b
Cython API: added EMBL parser and files to import are now read in binary
...
mode
2018-07-28 16:57:01 +02:00
Celine Mercier
7f6d1597fc
Taxonomy: added functions to check if a taxonomy already exists in a
...
DMS, and added taxdump import from a compressed file
2018-07-28 16:48:11 +02:00
Celine Mercier
1de308a856
obi clean: option to only keep heads now works, fixed a bug where last
...
sequence was not properly labelled, and code is cleaned, fixed and error
checked
2018-05-31 15:11:41 +02:00
Celine Mercier
892ed83a33
Removed deprecated function declarations
2018-05-31 15:08:11 +02:00
Celine Mercier
6911bf4d70
obi clean: first version
2018-05-18 14:26:54 +02:00
Celine Mercier
f0c147c252
C API: Added a function to set an entire column to a specified (atomic)
...
value.
2018-05-17 15:59:16 +02:00
Celine Mercier
4aef20add8
Fixed a bug where the line selection column of a view would not be
...
flagged as finished
2018-05-17 15:17:19 +02:00
Celine Mercier
62614a8538
Cython API: fixed a bug in URI decoding and option handling where the
...
quality offset would not be read properly
2018-05-17 15:10:52 +02:00
Celine Mercier
ffebc6acfb
Cython API: better handling of default quality offset value
2018-05-17 15:01:25 +02:00
Celine Mercier
b91b3176b0
obi uniq: fixed a bug where merged values were wrongly reinitialized
2018-05-17 14:58:15 +02:00
Celine Mercier
31d8ba5085
obi test: minor change
2018-05-17 14:54:45 +02:00
Celine Mercier
a166a169cf
obi ngsfilter: fixed a bug with -u option
2018-05-17 14:53:53 +02:00
Celine Mercier
8a10072d99
obi annotate: fixed a bug with --with-taxon-at-rank option and minor
...
improvements
2018-05-17 14:51:18 +02:00
Celine Mercier
b380368264
Obi count command
2018-04-04 15:51:23 +02:00
Celine Mercier
1f4e82e6f6
Fixed three bugs in obi uniq
2018-04-04 15:50:10 +02:00
Celine Mercier
6825fc13ab
Cython API: added ngsfilter file parser
2018-03-21 16:41:25 +01:00
Celine Mercier
49c17ab7b4
Cython API: added tabular file parser
2018-03-21 16:41:09 +01:00
Celine Mercier
2684535e26
New command: obi annotate
2018-03-21 16:39:31 +01:00
Celine Mercier
123fb9d7ba
Cython API: in taxonomy, added get_taxon_at_rank() function for Taxonomy
...
class and rank_idx property for Taxon class
2018-03-21 16:38:26 +01:00
Celine Mercier
4c3478d8f8
Removed the predicate to check for a quality column (because for example
...
with obi annotate, clone view so clone predicate, then modify seq, so
quality is deleted, and predicate becomes a problem)
2018-03-21 16:37:19 +01:00
Celine Mercier
4a815785c4
obi import: added basic taxdump import
2018-03-21 16:35:44 +01:00
Celine Mercier
75b54c83ca
obi grep: fixed bug when reading URIs
2018-03-21 16:34:57 +01:00
Celine Mercier
53cb3354b8
obi ls command
2018-03-19 13:08:41 +01:00
Celine Mercier
ea58e254da
Cython API: repr function for DMS
2018-03-19 13:08:06 +01:00
Celine Mercier
9fb63d4894
Minor fixes
2018-03-16 19:05:09 +01:00
Celine Mercier
d4f7e02c85
New obi grep working with URI API
2018-03-16 19:04:54 +01:00
Celine Mercier
15e43bb9a1
Cython API: obi import can now import ngsfilter files and tabular files
2018-03-12 18:10:43 +01:00
Celine Mercier
8a0b95c1d6
New command: obi ngsfilter
2018-03-12 18:09:22 +01:00
Celine Mercier
dd225a255f
obi uniq: better error checking
2018-03-12 18:04:53 +01:00
Celine Mercier
dad21823ff
Cython API: trying to guess the type of a column when adding a None
...
value does not generate an exception anymore, and RollbackException can
now rollback several views
2018-03-12 18:03:37 +01:00
Celine Mercier
96bf2daae8
Cython API: added slices in Seq classes and fixes
2018-03-12 17:51:41 +01:00
Celine Mercier
e6c49b7941
Cython API: moved an eval function to utils
2018-03-12 17:49:54 +01:00
Celine Mercier
4960662332
Cython API: tobytes() function now handles None values
2018-03-12 17:25:12 +01:00
Celine Mercier
b2cfa4b52f
Cython Sequence classes: reworked improved etc
2018-02-12 14:54:47 +01:00
Celine Mercier
94a899de12
Cython View API: added small tools
2018-02-12 14:48:27 +01:00
Celine Mercier
b48330a5c9
Fixed a little bug when cleaning unfinished views
2018-02-12 14:44:56 +01:00
Celine Mercier
74d880b817
Fixed default quality offset
2018-02-12 14:43:44 +01:00
Celine Mercier
00993d4215
Cython API: fixed a bug where the quality format would not be read
...
properly from the configuration values
2018-02-12 14:42:30 +01:00
Celine Mercier
370fb9272c
obi uniq: better typing
2018-02-12 14:38:07 +01:00
Celine Mercier
c8097e14e1
obi import: removed old traces
2018-02-12 14:36:56 +01:00
Celine Mercier
01ef85658c
New command: obi alignpairedend
2018-02-12 13:30:06 +01:00
Celine Mercier
f5a00c9322
Cython alignment library
2018-02-12 13:28:20 +01:00
Celine Mercier
156fb04e88
Implemented functions to build reverse complement sequences
2018-01-05 16:08:36 +01:00
Celine Mercier
428c4eb5e6
obi import: fixed creation of quality columns (to discuss)
2017-12-19 11:07:00 +01:00
Celine Mercier
1a5b499b5c
Cython API to add an OBI_QUAL column after creating a view
2017-12-19 11:06:24 +01:00
Celine Mercier
b7b8ba7e5a
Better handling of elements names in Cython
2017-12-13 23:12:14 +01:00
Celine Mercier
e9e7fac999
New obi uniq: stores columns with too many elements per line as
...
character strings, and keeps a minimum of things in the memory
2017-12-13 22:49:08 +01:00
Celine Mercier
1fd3323372
Columns: elements names informations are now kept in a memory arena of
...
adapted size in the header, and added a boolean in the header indicating
whether the values should be evaluated (typically character strings to
be evaluated in Python)
2017-12-13 22:46:50 +01:00
Celine Mercier
2df5932b67
Cython column API: fixed a memory leak, optimized the reading of
...
elements names, added a __len__ method to Column_line, and the API for
columns with character strings to evaluate
2017-12-13 22:27:36 +01:00
Celine Mercier
b93b982a18
Cython: added an option for input taxdump and and an option for the
...
maximum number of elements in columns with multiple elements per line
2017-12-13 22:25:15 +01:00
Celine Mercier
ea73047fc7
Added rewinddir before each readdir so that the directories are always
...
read properly
2017-11-24 18:04:58 +01:00
Celine Mercier
0998268955
Fixed two little potential bugs when cleaning unfinished columns and
...
deleted old trace
2017-11-24 18:03:59 +01:00
Celine Mercier
31726407a3
Taxonomy: fixed a bug where a pointer was not properly reallocated, and
...
a bug where the merged list of taxids was not built correctly
2017-11-24 18:01:30 +01:00
Celine Mercier
d21f4a6f90
Header parser: identifiers ending with ';' are now handled
2017-11-24 17:59:52 +01:00
Celine Mercier
9e3ac477eb
OBIDMS: Opened DMS now have a counter associated so that DMS are not
...
actually opened several times by the same program, which triggers the
cleaning of unfinished views and columns (to discuss)
2017-11-24 17:58:47 +01:00
Celine Mercier
ee5d647d0d
Taxonomy: fixed a bug un parental tree iterator
2017-11-24 17:55:17 +01:00
Celine Mercier
38fef5b9d4
obi test: better taxonomy testing
2017-11-24 17:54:10 +01:00
Celine Mercier
3ba7ce1c91
View rollback: version files and column directories aren't deleted
...
anymore to prevent indexer bug, and fixed a freeing bug
2017-11-15 17:27:26 +01:00
Celine Mercier
9a50803c00
Added tuple columns containing immutable indexed data arrays of any type
2017-11-15 13:48:59 +01:00
Celine Mercier
1684f96b79
Fixed a bug when flagging a read-only column as finished
2017-10-26 19:11:29 +02:00
Celine Mercier
43f65e7fd0
obi uniq: fixed bug where dictionary indexes were not read properly, and
...
added view rollback in case of an exception.
2017-10-26 19:00:05 +02:00
Celine Mercier
dfd51939a0
Views are now rollbacked if an error occurs, and unfinished views and
...
columns are deleted when an OBIDMS is opened.
2017-10-26 18:58:48 +02:00
Celine Mercier
1ae634d56b
Added atexit command to obi import, obi uniq and obi less
2017-10-16 11:09:55 +02:00
Celine Mercier
04e065094a
All DMS opened by a program are now listed and closed with atexit system
2017-10-16 10:35:07 +02:00
Celine Mercier
5ddd1d9ae6
obi uniq: added taxonomy handling
2017-10-04 16:13:07 +02:00
Celine Mercier
9fc6868341
Increased maximum length for elements names
2017-10-04 16:10:53 +02:00
Celine Mercier
f2ece573ff
Removed deprecated command
2017-10-04 16:09:41 +02:00
Celine Mercier
fb9b219abe
Fixed a bug with taxonomy URIs not being read correctly
2017-10-04 16:00:30 +02:00
Celine Mercier
09a5f89849
Column API: improvements to be more flexible when referring to elements
...
in columns with several elements per line.
2017-10-04 15:59:23 +02:00
Celine Mercier
535692b020
Taxonomy: new functions and improvements
2017-10-04 15:55:13 +02:00
Celine Mercier
0ab081f79e
Updated obi test to work with changes in taxonomy API
2017-10-04 15:50:32 +02:00
Celine Mercier
1cb05de7e3
Basic obi less
2017-10-04 15:46:26 +02:00
Celine Mercier
532d8e9cd7
obi import: small efficiency improvement when dealing with NA values
2017-10-04 15:44:48 +02:00
Celine Mercier
b4088a7928
Cython API: Added basic taxonomy option
2017-10-04 15:42:17 +02:00
Celine Mercier
ae24a807da
obi uniq: added the option to merge ids, except it only works on small
...
sets until lists are implemented properly using obiblobs
2017-09-25 17:28:03 +02:00
Celine Mercier
75c15594c4
obi uniq: added option to use categories additionally to the sequence to
...
determine uniqueness
2017-09-25 10:56:43 +02:00
Celine Mercier
5ed6835e0e
Fixed a bug where the new line count when truncating a column would not
...
be computed correctly when dealing with high numbers (bad automatic type
for intermediate result)
2017-09-25 10:52:19 +02:00
Celine Mercier
41dec03448
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2017-09-18 16:08:31 +02:00
Celine Mercier
7c57bd33e5
Added check to prevent views from having the name 'taxonomy' (used for
...
URIs)
2017-09-15 14:54:55 +02:00
a776e46e6d
Add the command name in the log
2017-09-15 14:51:13 +02:00
Celine Mercier
0e140df0fb
Cython API: added some imports in __init__ files
2017-09-14 18:30:04 +02:00
4bb071c048
Merge branch 'master' of
...
git@git.metabarcoding.org:obitools/obitools3.git
Conflicts:
python/obitools3/commands/import.pyx
2017-09-05 08:59:45 +02:00
5045d0c2e9
xxx
2017-09-05 08:58:07 +02:00
Celine Mercier
73bca6288f
New obi uniq
2017-08-20 18:04:21 +02:00
Celine Mercier
6a2759eee6
obi import with new input/ouput API
2017-08-20 17:58:36 +02:00
Celine Mercier
38029b1f77
Forgot a ;
2017-08-20 17:56:18 +02:00
Celine Mercier
663a1a1091
Cython API: column elements: added possibility to check if an element
...
exists from its index, and a dict-like get() method
2017-08-20 17:44:05 +02:00
Celine Mercier
c6d5436a58
Cython API: fixed a bug where iteration on a NUC_SEQS view would not be
...
done correctly (bug appeared with optimization modifications done
lately)
2017-08-20 17:41:41 +02:00
Celine Mercier
47cad285d6
Cython API: fixed 2 little bugs in Seq API
2017-08-20 17:39:30 +02:00
Celine Mercier
74f15d1a23
Cython API: Various fixes in input handlers (parsers, openers etc).
...
Mostly working but not bug-free
2017-08-20 17:37:51 +02:00
Celine Mercier
c559ddf487
BUG FIX: creation of a new column would fail because of a case not
...
handled when a high number of elements per line would imply less than
one line per memory page
2017-08-20 17:30:23 +02:00
Celine Mercier
93cff94e7f
Fixed some compilation warnings
2017-08-20 17:25:58 +02:00
Celine Mercier
9744a48a67
BUG FIX: seemingly identical obiblobs would have different hash values
...
because of the padding added by the compiler. Fixed by using calloc
instead of malloc for obiblob memory allocation.
2017-08-20 17:25:15 +02:00
Celine Mercier
6afdc9fb5f
AVLs: Added an error check
2017-08-20 17:21:06 +02:00
Celine Mercier
6f202363f4
Fixed a typo in doc
2017-08-20 17:20:13 +02:00
Celine Mercier
7f1ff49aa2
Cython API to import a column and a view from a DMS to another DMS
2017-08-03 16:34:02 +02:00
Celine Mercier
4b86aa67a8
New C functions to import a column and a view from a DMS to another DMS
2017-08-03 16:33:12 +02:00
Celine Mercier
a3e81930c2
Views: finished handling and documenting the conditions for an existing
...
column to be added to a view
2017-08-03 16:32:22 +02:00
Celine Mercier
644b55b49f
Fixed doc typo
2017-08-03 16:29:25 +02:00
Celine Mercier
927c684fc2
Utils: new function to copy the content of a file into another file
2017-08-03 16:28:54 +02:00
Celine Mercier
344566d9e9
AVLs: made some functions public and changed some rights to be able to
...
import AVLs from a DMS to another
2017-08-03 16:27:43 +02:00
407f61a408
Add the possibility to create temporary objects like a temporary
...
directory and a temporary DMS
2017-07-28 16:33:19 +02:00
09ddd74652
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2017-07-28 15:57:01 +02:00
7c0d882bc9
Patch a bug when creating a DMS not in the current directory. Use the
...
basename function to locate the DMS name instead of the loop...
2017-07-28 15:56:21 +02:00
Celine Mercier
35b0c55a8c
Cython API: various improvements and checks
2017-07-28 13:15:13 +02:00
b9c65a871f
Patch decoding of URL
2017-07-28 12:41:28 +02:00
Celine Mercier
84bb93096f
Cython API: fixes and improvements in Column API
2017-07-28 10:27:04 +02:00
Celine Mercier
01c69e7e25
Cython API: fixed a bug when printing a column
2017-07-28 10:01:56 +02:00
Celine Mercier
adf5cbef97
Added DMS method to create a DMS if it doesn't already exists, otherwise
...
opens it
2017-07-28 09:55:43 +02:00
da48a9d1af
Patch group of option : types must be callable not a string
2017-07-28 09:36:18 +02:00
Celine Mercier
9482c663c0
minor comments and changes
2017-07-27 19:46:34 +02:00
Celine Mercier
c5f3fdc295
Increased maximum element names length in columns
2017-07-27 19:44:49 +02:00
Celine Mercier
89e2f80fd8
Goes with previous commit
2017-07-27 19:43:00 +02:00
Celine Mercier
7112f44fb7
Bug fixes for input handlers, openers, parsers etc. Compiling but not
...
tested
2017-07-27 19:42:44 +02:00
Celine Mercier
b2fc1f4611
obi uniq: first version
2017-07-27 19:40:19 +02:00
Celine Mercier
75f691d55a
Cython API: Seq classes reworked
2017-07-27 19:39:58 +02:00
Celine Mercier
0655063bb0
Cython API: view_NUC_SEQS changes to go with previous commits
2017-07-27 19:39:26 +02:00
Celine Mercier
9701b1230c
Cython API: OBIWrapper.new method is now OBIWrapper.new_wrapper to avoid
...
mismatching method definitions with subclasses
2017-07-27 19:38:25 +02:00
Celine Mercier
f8a4428674
Cython API: DMS test_open method doesn't raise an exception anymore
2017-07-27 19:36:28 +02:00
Celine Mercier
1a0f18a11a
Cython API: added a __setitem__ method to the View class that can detect
...
if the item is a Line and create the corresponding columns if needed +
minor changes
2017-07-27 19:35:28 +02:00
Celine Mercier
3d7aa52c90
Cython API: Fixed a bug when setting NA values in Column_multi_elts, and
...
added some properties
2017-07-27 19:31:15 +02:00
Celine Mercier
69c50ff922
Cython API: added a Column subclass to allow direct access to indexes
...
for columns that store indexes referring to other data
2017-07-27 19:29:10 +02:00
Celine Mercier
c91969126b
Cython C API declarations to go with previous commit
2017-07-27 19:26:59 +02:00
Celine Mercier
15d383fa8b
Added possibility to specify the offset for encoding and decoding
...
sequence quality character strings
2017-07-27 19:24:41 +02:00
Celine Mercier
99ceed5fff
Cython API: renamed OBI_Taxonomy to Taxonomy and OBI_Taxon to Taxon
2017-07-27 19:21:45 +02:00
fa8f826cdc
Cleanup the end of the file
2017-07-27 16:07:39 +02:00
dc91174a5e
Complete the input option group functions
2017-07-27 16:06:48 +02:00
ec65f00cf2
Complete the fasta iterator to manage new input options
2017-07-27 16:05:30 +02:00
8d9cdb4d03
Complete the fastq iterator to manage new input options
2017-07-27 16:05:17 +02:00
949e5f9baf
Make a first full version of the URI decoder
2017-07-27 16:04:31 +02:00
3c6a05be54
Add option to the default config corresponding to the parsing of the
...
inputs
2017-07-27 16:03:47 +02:00
8781ecab1f
Add a factory checking the file format and returning the correct
...
iterator. First version working only with fasta and fastq nucleic
formats
2017-07-27 16:02:52 +02:00
0f6ae7dfa6
Options stuff... ;-)
2017-07-25 13:07:03 +02:00
28259cd88b
Beginning of URI decoder -- !!! NOT YET FULLY IMPLEMENTED !!!
2017-07-25 13:05:58 +02:00
b24be84b0a
Add a first group of options
2017-07-25 11:14:30 +02:00
Celine Mercier
59dd0a8a8c
Standardized and improved the API to create new columns, updated the doc
2017-07-18 17:34:32 +02:00
Celine Mercier
c88df2e12c
First version of automatic ID and COUNT columns, to discuss (for now,
...
columns created when NUC_SEQ views are closed if the columns don't
already exist)
2017-07-17 17:31:09 +02:00
Celine Mercier
1e57bfacb4
Fixed some C documentation
2017-07-17 16:45:08 +02:00
Celine Mercier
3e6aecc635
Added a C function to add a COUNT column to a view with all lines set to
...
1
2017-07-11 16:44:23 +02:00
Celine Mercier
ced9a268a1
obi import: added an option to specify the NA value in the input file
...
(default is 'NA', same as in R's read.table function)
2017-07-11 12:10:33 +02:00
Celine Mercier
df2ad41150
Cython APi: Added a width property to views, corresponding to their
...
column count
2017-07-11 11:46:32 +02:00
Celine Mercier
f8895e879d
Cython API: Added a function to get a column from its index in the view
2017-07-11 11:36:42 +02:00
Celine Mercier
b729b8928f
obi less: fixed bug when the length of a view would be less than the
...
default number of lines printed
2017-07-10 17:04:02 +02:00
Celine Mercier
b6b95f26b6
obi import: Skipping sequences is now done through the iterators so that
...
sequences are not uselessly parsed
2017-07-10 17:02:30 +02:00
Celine Mercier
b94ec9557f
Cython API: None values aren't inclued anymore in the dictionary
...
returned when getting a line from a column with multiple elements per
line, and reworked that function to be more optimized
2017-07-07 17:28:53 +02:00
Celine Mercier
143bddf1d1
Cython API: Added an __iter__ method to the class Column_line (iterating
...
on the elements names) (previously an iteration would work but with
unexpected results)
2017-07-07 15:41:10 +02:00
Celine Mercier
a718081ebd
Bug with error handling: for now obi_errno needs to be passed to the
...
function handling errors and exceptions, as it can't read the right
value of the global obi_errno (Cython configuration problem?)
2017-07-07 15:36:11 +02:00
Celine Mercier
740d021276
obi import: fixed bugs when rewriting a column: a bug with new elements
...
names ignoring previous elements names found, a bug with the global
obi_errno being reset too late, and a bug with the column dictionary
used by obi import not being updated after rewriting a column
2017-07-07 15:33:43 +02:00
Celine Mercier
906343187b
Fixed bug with view option in obi less and obi check
2017-07-06 16:42:27 +02:00
Celine Mercier
c3cd57a9e3
Removed deprecated file
2017-07-06 10:57:14 +02:00
Celine Mercier
f03928c679
Committing minor comments before merging branch with master
2017-07-06 10:56:39 +02:00
Celine Mercier
717ee46f08
Commented a loose print
2017-07-05 18:02:18 +02:00
Celine Mercier
313508cc94
Better *Seq* classes but still need work
2017-07-05 17:53:46 +02:00
Celine Mercier
535fc2af83
Column rewriter and optimized View getter
2017-07-05 17:49:05 +02:00
Celine Mercier
3bbc2ae469
More optimized Column item getter
2017-07-05 17:37:19 +02:00
Celine Mercier
5ee0b3989a
Cython API: set_line of Column_multi_elts now accept as values argument
...
any class where values are referenced by keys with an iterator
2017-07-05 17:32:32 +02:00
Celine Mercier
d10192ab0e
C functions to detect IUPAC sequences
2017-07-05 17:26:03 +02:00
Celine Mercier
101f764cce
New obi import with rewriting of columns when column type or line
...
elements (keys) change
2017-07-05 17:15:23 +02:00
Celine Mercier
cb5ad2ed2d
Added functions to try to open a DMS if it exists
2017-07-05 15:38:22 +02:00
Celine Mercier
f5e992abbf
Added a check on the element when setting a value in a column
2017-07-05 14:49:20 +02:00
Celine Mercier
1d2996c6c0
Better handling and tracing of Index Errors between C and Cython
2017-07-05 14:45:43 +02:00
Celine Mercier
f6631f3857
Removed deprecated declarations
2017-07-05 14:42:21 +02:00
Celine Mercier
3f5fef10b9
obi test: minor changes
2017-07-05 14:37:27 +02:00
Celine Mercier
20c72af697
Basic obi check command to check DMS and view informations
2017-07-05 13:54:19 +02:00
Celine Mercier
d252131950
Basic obi less command
2017-07-05 13:44:12 +02:00
Celine Mercier
ca16ce0bb0
Basic obi grep with new Cython API
2017-07-05 11:58:10 +02:00
Celine Mercier
ac94b35336
Removed unused import
2017-07-05 11:52:31 +02:00
Celine Mercier
2d65db4ebc
Goes with c2af955b : forgotten files for NUC_SEQS views
2017-04-21 15:15:12 +02:00
Celine Mercier
4b037ae236
Updated obi test to test NUC_SEQS views and the taxonomy API
2017-04-21 12:09:04 +02:00
Celine Mercier
c2af955b78
Cython view API: added NUC_SEQS views and sequence classes + changed
...
cloning API
2017-04-21 12:08:14 +02:00
Celine Mercier
71b1a43df8
Added functions to clone views with a simpler API
2017-04-21 11:58:15 +02:00
Celine Mercier
1725b8b80c
Reworked taxonomy Cython API to be a subclass of OBIWrapper
2017-04-21 11:54:05 +02:00
Celine Mercier
ab0d08293e
Cython API: removed unnecessary imports
2017-04-21 11:51:05 +02:00
Celine Mercier
2f0c4b90d7
Fixed a problem where a view would have a wrong line count after adding
...
a first column to it if there was already a Line selection associated
(happening when cloning), and fixed a bad error check.
2017-04-14 16:25:55 +02:00
Celine Mercier
537b9847da
Minor C doc clarification
2017-04-14 16:23:17 +02:00
Celine Mercier
b998373be5
Cython API: updated the test command for the new API and deactivated the
...
other commands for now
2017-04-14 16:21:33 +02:00
Celine Mercier
6f780148e2
Cython API: added taxonomy API
2017-04-14 16:20:30 +02:00
Celine Mercier
0e08fc486a
Cython API: fixed bug when deleting a column from a view where the
...
Cython wrapper wasn't closed, and fixed the Line selection
materialization
2017-04-14 16:19:18 +02:00
Celine Mercier
2bbee64e57
Cython API: fixed problems with Column class
2017-04-14 16:14:41 +02:00
Celine Mercier
693859eec2
Cython API: fixed conversion bugs when setting and getting values
...
(especially NA values) in OBI_CHAR, OBI_STR and OBI_SEQ columns
2017-04-14 16:07:23 +02:00
Celine Mercier
a3fad27190
Cython API: automatic importing of column classes now works
2017-04-06 15:45:02 +02:00
Celine Mercier
f351540b0b
Merge branch 'Eric_new_Python_API' of git@git.metabarcoding.org:obitools/obitools3.git into Eric_new_Python_API
2017-04-06 15:39:52 +02:00
6dccaa0213
Patch the registering function : register_all_column_classes
2017-04-06 15:37:51 +02:00
Celine Mercier
5de9e0de51
Cython API: now using const char* instead of char* for the type of
...
values read from OBI_STR columns
2017-04-06 15:15:20 +02:00
Celine Mercier
ad8de80353
Views: better checks when adding an existing column to a view
2017-04-06 14:44:07 +02:00
Celine Mercier
8cd3e3604f
Cython Column API
2017-04-06 14:42:11 +02:00
Celine Mercier
255f3c92ae
Cython View API
2017-04-06 14:41:58 +02:00
Celine Mercier
08be4e231d
Cython Object API
2017-04-06 14:41:43 +02:00
Celine Mercier
b5b7995411
new Cython DMS API
2017-04-06 14:41:26 +02:00
Celine Mercier
0dfb1eb3e6
Cython typed columns
2017-04-06 14:40:44 +02:00
Celine Mercier
381194194c
Cython API: compiling but not working
2017-03-06 16:07:02 +01:00
Celine Mercier
778acc48cd
Added linked lists to handle lists of column pointers in views (not
...
tested)
2017-03-06 16:06:17 +01:00
Celine Mercier
3319ede837
Views: Column dictionaries now store and return pointers on column
...
pointers instead of column pointers.
2017-02-22 13:49:50 +01:00
Celine Mercier
fc20b83ad1
Merging
2017-02-20 14:56:04 +01:00
Celine Mercier
431c1c8c6a
Merge branch 'Eric_new_Python_API' of
...
git@git.metabarcoding.org:obitools/obitools3.git into
Eric_new_Python_API
Conflicts:
python/obitools3/obidms/_obidms.pxd
python/obitools3/obidms/_obidms.pyx
python/obitools3/obidms/_obidmscolumn_bool.pyx
python/obitools3/obidms/_obidmscolumn_str.pyx
python/obitools3/obidms/_obiseq.pxd
python/obitools3/obidms/_obiseq.pyx
python/obitools3/obidms/_obitaxo.pxd
python/obitools3/obidms/_obitaxo.pyx
python/obitools3/obidms/_obiview.pxd
python/obitools3/obidms/_obiview.pyx
python/obitools3/obidms/_obiview_nuc_seq.pxd
python/obitools3/obidms/_obiview_nuc_seq.pyx
python/obitools3/obidms/_obiview_nuc_seq_qual.pxd
python/obitools3/obidms/_obiview_nuc_seq_qual.pyx
python/obitools3/obidms/capi/obialign.pxd
python/obitools3/obidms/capi/obidmscolumn.pxd
python/obitools3/obidms/capi/obitaxonomy.pxd
python/obitools3/obidms/capi/obiview.pxd
2017-02-20 14:55:36 +01:00
Celine Mercier
f23315e26f
New Cython API: compile but doesn't work
2017-02-17 15:14:06 +01:00
Celine Mercier
071a3b61ab
Merged master fixed conflict.
2017-02-14 10:58:43 +01:00
Celine Mercier
e524041013
Views: Files for unfinished views now have the extension
...
'.obiview_unfinished', renamed to '.obiview' when the view is finished.
2017-02-07 17:16:09 +01:00
Celine Mercier
a9102620f5
Fixed missing email address
2017-02-07 17:14:10 +01:00
Celine Mercier
7e9932f488
Fixed a C function declaration
2017-02-07 17:12:56 +01:00
Celine Mercier
e50da64ea1
The elements names when a column contains several elements per line are
...
now formatted with '\0' as separator and handled in a more optimized way
2017-01-31 16:48:06 +01:00
Celine Mercier
651c1d7845
utilities: bsearch and qsort with additional user_data pointer argument
2017-01-31 16:45:47 +01:00
Celine Mercier
c0bcdce724
Taxonomy: documentation for all the functions, and fixed bugs when
...
closing the taxonomy (overwriting of .pdx files, missing freeing, and
re-placed a misplaced condition)
2017-01-18 18:22:49 +01:00
Celine Mercier
c065c1914a
Taxonomy: adding, writing and reading preferred names, changed some
...
function names, and fixed a bug with taxa indices not being properly
initialized
2017-01-16 17:28:20 +01:00
Celine Mercier
0385a92e02
Taxonomy: Refactored the taxdump reading, and little fixes
2017-01-11 16:36:08 +01:00
cf7f2de016
Modify __init__ and close method to deal with registration process
2017-01-10 14:26:16 +01:00
5122ad52a7
Merge branch 'Eric_new_Python_API' of git@git.metabarcoding.org:obitools/obitools3.git into Eric_new_Python_API
2017-01-10 14:07:50 +01:00
4b02ba73ac
Add the OBIObject concept
2017-01-10 14:07:10 +01:00
Celine Mercier
41ad3deec0
Taxonomy: informations about deleted taxids is now read from
...
delnodes.dmp file and added to *.adx file
2017-01-09 17:28:49 +01:00
Celine Mercier
d68374018b
Taxonomy: functions to read the *.adx file (containing the deprecated
...
and current taxids and their corresponding indices in the taxa
structure) and to find the taxa using the merged index.
2017-01-06 15:52:21 +01:00
Celine Mercier
f396625f98
Taxonomy: function to write *.adx files
2017-01-05 15:37:13 +01:00
Celine Mercier
897032387f
Taxonomy: reading merged.dmp file in taxdump
2017-01-05 14:28:36 +01:00
4a1d3167a7
Last change on my branch
2017-01-02 16:46:52 +01:00
153c22257f
Last change on my branch
2017-01-02 16:46:17 +01:00
2139bfc748
refactoring...
2017-01-02 13:05:22 +01:00
65f3b16e6d
Refactoring ...
2016-12-29 18:22:05 +01:00
0526386337
first working DMS class
2016-12-27 06:17:45 +01:00
62caf1346e
temporary remove some files
2016-12-26 15:03:24 +01:00
3ac6e85fb3
Big refactoring 4
2016-12-26 14:58:03 +01:00
5156f6bb9e
Big refactoring 3
2016-12-26 14:18:01 +01:00
e6db2086d5
Big refactoring 2
2016-12-26 13:56:31 +01:00
daacd0df76
Strong refactoring 1
2016-12-26 13:35:31 +01:00
Celine Mercier
8e92bf6dac
LCS alignment: it is now checked that sequences are not longer than what
...
a 16 bits integer can code for (as the LCS and alignment lengths are
kept in 16 bits registers)
2016-12-22 17:06:23 +01:00
Celine Mercier
30e4359c85
LCS alignment: documentation for all the lowest level functions
2016-12-22 17:03:51 +01:00
Celine Mercier
5c50e5b378
Embryo of code for openMP parallelization of LCS alignment but
...
deactivated for now because can't make it compile with cython/clang
2016-12-20 11:46:58 +01:00
3cedd00d7f
Add register function for column type
2016-12-20 11:13:57 +01:00
82fbe43980
transfert method to obiviews
2016-12-20 08:18:47 +01:00
d1a972dfcb
patch import
2016-12-20 08:15:42 +01:00
f43dc3e3ab
separate the obicolumn classes in new files
2016-12-20 08:15:08 +01:00
Celine Mercier
9c71b06117
Removed deprecated TODOs
2016-12-19 14:36:40 +01:00
Celine Mercier
3bf5260174
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2016-12-19 10:31:18 +01:00
Celine Mercier
857a5198e4
Updated `obi lcs` for the LCS alignment of two columns
2016-12-16 19:40:36 +01:00
Celine Mercier
d99447c12b
C function for LCS alignment of two columns, and optimized and fixed
...
line count bug in function to align one column
2016-12-16 19:39:02 +01:00
Celine Mercier
303bd6f445
Added function to build kmer table for 2 columns, and fixed bug (with
...
line count) when building kmer table of one column
2016-12-16 19:10:18 +01:00
Celine Mercier
490f5fe6b9
Updated deprecated code in cython API for columns (using line count of
...
view instead of column)
2016-12-16 19:04:21 +01:00
Celine Mercier
191c83aafc
Added missing *.cfiles
2016-12-15 15:28:34 +01:00
04d39c62ab
Try for a new API
2016-12-14 08:44:44 +01:00
Celine Mercier
9b24818fe2
Refactored alignment code for minimum redundancy between the function
...
that aligns 1 column and the function that aligns 2 columns
2016-12-13 17:18:12 +01:00
06cb7a9a58
Some change in the way to manage access to special items of the
...
dictionary like sequence or quality
2016-12-13 12:49:34 +01:00
fc55fc117d
Some cosmetic on the code
2016-12-13 12:48:13 +01:00
4ef5cb0d87
Move the OBIView_NUC_SEQS class to files _obiview_nuc_seq.pxd and
...
_obiview_nuc_seq.pyx to avoid circular inclusion
2016-12-13 12:46:49 +01:00
fc805e5443
Remove some warnings in the editor
2016-12-13 08:29:22 +01:00
8d7ef7d3d1
patch the distutils to add the C source directory in the include path.
...
This should solve most of the compilation problems related to .h files
located in this directory
2016-12-13 08:02:09 +01:00
Celine Mercier
8afb1644e9
Alignment: API rework. 'obi align' is now 'obi lcs', and the results are
...
now written to columns automatically created in the output view, all
optimally handled at the C level.
2016-12-12 11:58:59 +01:00
Celine Mercier
fa4e4ffaff
Changed the cython API to create new views so as to have different
...
functions for the different cases
2016-12-07 14:17:57 +01:00
Celine Mercier
936be64c34
Goes with 5e0c9f87 (missing ';' and fixed compilation warnings)
2016-12-05 11:18:29 +01:00
Celine Mercier
5e0c9f878b
Added the doc for the function building the element names, and a missing
...
free
2016-12-05 10:46:21 +01:00
Celine Mercier
852e5488c8
The default element names for columns with multiple elements per line
...
are now "O;1;2;...;n"
2016-12-02 17:54:51 +01:00
Celine Mercier
e60497651c
Updated the documentation for the functions to set and get in the
...
context of a view
2016-11-30 12:22:47 +01:00
Celine Mercier
4ad8c16a73
Finished adding all the functions to directly set and get indices in
...
columns containing indices referring to any type of data.
2016-11-30 11:08:11 +01:00
Celine Mercier
6f6099687d
Sequence alignment: if no sequence column is given and the view has the
...
type NUC_SEQS_VIEW, the default sequence column is aligned
2016-11-29 16:52:41 +01:00
Celine Mercier
98d0849653
Sequence alignment: added the possibility to specify the index of the
...
sequences to align in a column containing multiple sequences per line (C
level for now)
2016-11-29 16:15:02 +01:00
Celine Mercier
5fb025f310
When aligning, it is now quickly checked whether the sequences are
...
identical using their indexes
2016-11-28 11:39:29 +01:00
Celine Mercier
8ce6f6c80b
Added an argument to specify whether the two sequences can be identical
...
when applying filters before aligning
2016-11-28 11:38:02 +01:00
Celine Mercier
3e53f9418b
Added functions to recover the indexes themselves from any column
...
referring to indexed values
2016-11-28 11:35:19 +01:00
Celine Mercier
d40d2d0c76
Fixed error in documentation
2016-11-28 10:55:23 +01:00
Celine Mercier
f897e87600
When closing a view, it is now automatically checked that all OBI_QUAL
...
columns correspond to their associated OBI_SEQ column
2016-11-25 12:04:57 +01:00
Celine Mercier
70e056a2aa
It is now impossible to open or clone a view that is not finished (= has
...
been closed at least once)
2016-11-24 11:19:07 +01:00
Celine Mercier
8abbfa203a
Good file for commit 6fa9a8bd: When a view is cloned, a comment is added
...
to the new view specifying the name of the cloned view
2016-11-23 11:32:39 +01:00
Celine Mercier
6fa9a8bd76
When a view is cloned, a comment is added to the new view specifying the
...
name of the cloned view
2016-11-23 11:29:21 +01:00
Celine Mercier
76a4c6b14e
Fixed a bug when cloning a view and checking its type
2016-11-23 11:28:17 +01:00
Celine Mercier
0ab9e6c05a
When adding an existing column to a view, it is checked that the
...
column's line count is at least the view's line count. This can't be
more stringent for reasons that need to be rediscussed
2016-11-23 11:04:53 +01:00
Celine Mercier
70c49e214a
Added the kmer filter to LCS alignments, and now obiblobs containing
...
encoded sequences are directly put in int16_t arrays for the alignment
2016-11-18 16:29:28 +01:00
Celine Mercier
08e67a090f
Changed the inline functions syntax, which should make it compatible
...
with more compilers
2016-11-18 16:21:26 +01:00
Celine Mercier
621b4972db
Functions to get obiblobs through views
2016-11-18 15:59:50 +01:00
Celine Mercier
7d022c1a52
If the indexer name is NULL when creating a column, it now becomes the
...
column name
2016-11-18 15:56:51 +01:00
Celine Mercier
1c71c195fc
Goes with a0ebc2d8
2016-11-10 15:01:29 +01:00
Celine Mercier
54cfeffd85
Goes with 8f724f4f, forgotten file
2016-11-10 14:48:31 +01:00
Celine Mercier
a0ebc2d871
Functions to directly retrieve Obiblobs from indexers
2016-11-10 14:45:28 +01:00
Celine Mercier
8f724f4f8e
Some code refactoring
2016-11-09 16:48:00 +01:00
Celine Mercier
359578814b
Added view type property to OBIView cython class and updated obi export
...
to use it
2016-11-08 17:49:59 +01:00
Celine Mercier
51b23915ca
Added properties for Nuc_Seq cython classes (and updated commands using
...
them)
2016-11-08 16:59:32 +01:00
Celine Mercier
b5b889c4a2
Fixed the OBI_Nuc_Seq_Stored cython class not being up to date with the
...
new properties of its parent class
2016-11-08 11:26:37 +01:00
Celine Mercier
36ac315125
Fixed bugs with python view type when creating a new view, and a bug
...
when trying to guess the obi type of a nucleotide sequence when its type
was bytes
2016-11-08 11:23:54 +01:00
Celine Mercier
8291693309
obi grep: updated to work with the new line selection class and within
...
the local sequence environment, and progress bar functioning
2016-11-08 11:19:12 +01:00
Celine Mercier
4bc19c3e49
obi export: view type is now checked and progress bar functioning
2016-11-08 11:17:20 +01:00
Celine Mercier
2d2fe5279d
Added functions to add new taxa to a taxonomy with handling of
...
associated *.ldx files
2016-11-03 17:59:21 +01:00
Celine Mercier
2504bf0fa9
Added an iterator to the OBI_Taxonomy cython class
2016-11-02 11:08:18 +01:00
Celine Mercier
d8a257e711
Taxonomy handling functions in C. Features: read taxdump, read binary
...
files, write binary files. Not fully handled yet: *.adx, *.pdx, *.ldx,
merged.dmp and delnodes.dmp files.
2016-10-27 18:56:11 +02:00
Celine Mercier
b63d0fb9fb
Added C functions to write .rdx, .tdx, .ndx binary taxonomy files from a
...
taxonomy C structure
2016-10-14 17:03:10 +02:00
Celine Mercier
0dfd67ec89
The endianness of binary taxonomy files is now correctly checked
2016-10-10 17:04:29 +02:00
Celine Mercier
0faaac49cf
The taxonomy directory of the DMS is now automatically created with the
...
DMS
2016-10-10 17:02:51 +02:00
Celine Mercier
1b07109e51
Removed deprecated code
2016-10-10 17:01:51 +02:00
Celine Mercier
60ab503a14
Added properties in the OBI_Taxonomy class
2016-10-10 17:01:17 +02:00
Celine Mercier
2dcfdc59fc
When a new view is created with a line selection, the view to clone is
...
automatically found + compacted redundant code + fixed potential bug
when cloning a NUC_SEQS view by name
2016-10-06 17:55:18 +02:00
Celine Mercier
399fc2c051
Removed deprecated source files previously used for tests
2016-09-30 17:49:37 +02:00
Celine Mercier
9cd57deca9
Added OBIView_line_selection class to make new line selections
...
associated with the view to clone, and improved and renamed method
closing a view
2016-09-30 17:48:53 +02:00
Celine Mercier
d88811ed7d
Added a seed option to the obi test command for reproducible tests
2016-09-29 17:34:48 +02:00
Celine Mercier
8c402101e4
Renamed private attributes as _* and removed some deprecated code
2016-09-28 16:56:44 +02:00
Celine Mercier
1a7b42018e
Added some error checking when opening or creating a view
2016-09-28 14:28:34 +02:00
Celine Mercier
b717e8bb8b
Added properties for the OBIView class and cleaned up deprecated code
2016-09-28 14:26:23 +02:00
Celine Mercier
03a2c8ef7c
Finished restructuring the OBIDMS_column class properties
2016-09-27 14:16:30 +02:00
Celine Mercier
a7f891d1c9
Added a lines_used property to the OBIDS_column class
2016-09-26 18:04:28 +02:00
Celine Mercier
bd50b3f972
Added version property to OBIDMS_column class
2016-09-26 17:45:10 +02:00
Celine Mercier
81380363b7
Added original_name property to OBIDMS_column class
2016-09-26 17:31:32 +02:00
Celine Mercier
a4b8349274
Added data_type property to OBIDMS_column class
2016-09-26 17:12:20 +02:00
Celine Mercier
a474391b27
Added nb_elements_per_line property to OBIDMS_column class
2016-09-26 17:01:13 +02:00
Celine Mercier
a0bc45cc92
Added elements_names property to OBIDMS_column class
2016-09-26 16:53:16 +02:00
Celine Mercier
76f89717fe
Added alias property to OBIDMS_column cython class
2016-09-26 16:12:48 +02:00
Celine Mercier
b408a4f6eb
Changed file name limits to adapt to system limits + minor changes
2016-09-22 18:05:07 +02:00
Celine Mercier
b083745f56
Deleted the "new line selection while editing a view" system
2016-09-22 11:19:29 +02:00
Celine Mercier
43f3c69a40
Fixed bug when cloning column with line selection
2016-09-21 17:50:21 +02:00
Celine Mercier
e79507b629
Fixed bugs in the process ensuring that all the columns of a view have
...
the same line count, fixed a bug when trying to set a value in a view
when a line selection exists, fixed a bug when adding a new column to a
view where line counts would be wrong
2016-09-21 17:42:17 +02:00
Celine Mercier
bb25723d99
Improved documentation of a function
2016-09-21 17:30:39 +02:00
Celine Mercier
a0da984003
Fixed bug where columns would not get truncated to the right size, and
...
fixed bug where column directories would be open and not closed in some
instances
2016-09-21 17:28:52 +02:00
Celine Mercier
802bae110b
Removed deprecated function
2016-09-21 17:09:59 +02:00
Celine Mercier
dd55aef3e5
Added column class method to get the unique references (name and
...
version) of a column
2016-09-21 17:08:44 +02:00
Celine Mercier
9ac522fde1
Better obi test command
2016-09-21 17:06:35 +02:00
6adb9eb623
Should solde issue #56
2016-09-19 21:40:40 +02:00
Celine Mercier
8f49553d5a
First version of the obi test command, testing that the OBITools3 work
...
correctly
2016-09-15 12:26:07 +02:00
Celine Mercier
986f90c59e
Fixed bug where column directories weren't closed correctly, leading to
...
too many file descriptors open, and added error checking when closing
file descriptors
2016-09-15 12:18:40 +02:00
Celine Mercier
a240ec0169
Added error checking when closing file descriptors
2016-09-15 11:58:56 +02:00
Celine Mercier
0a3c23d9d0
Added a missing closedir
2016-09-15 11:58:34 +02:00
Celine Mercier
8724445fa1
Added error checking when closing files
2016-09-15 11:50:30 +02:00
Celine Mercier
de189fd7e0
Fixed major bug when cloning an AVL where the bloom filter was not
...
copied properly (because the sutructure copy via assignation does not
work for structures with a variable size)
2016-09-15 11:47:02 +02:00
Celine Mercier
9a97f1f633
View predicates are now carried over when cloning a view
2016-09-06 16:22:24 +02:00
Celine Mercier
00014eb023
View files now have the *.obiview extension
2016-09-06 14:19:13 +02:00
Celine Mercier
acc0da2d0b
Readjusted some limits for file names and file numbers to be under OS
...
limits
2016-09-05 12:39:04 +02:00
Celine Mercier
668696fc5a
Fixed major bug: when setting all the columns of a view to the same
...
number of lines, columns are now cloned before being enlarged if needed
+ predicate functions now print error messages if the predicates are not
respected
2016-09-05 12:37:36 +02:00
Celine Mercier
ba84ef4847
Fixed typo
2016-09-05 12:31:06 +02:00
Celine Mercier
c9dce03295
Fixed major bug when cloning an AVL group (last AVL of new group was not
...
correctly enlarged before copying the data) + minor improvements
2016-09-05 12:29:52 +02:00
Celine Mercier
eb82d088cb
Added some view class methods
2016-09-05 12:20:00 +02:00
Celine Mercier
f46ea0b988
Finished fixing issues with DMS paths
2016-08-30 11:09:45 +02:00
Celine Mercier
5b2e370ffb
Fixed a bug when using an absolute path for a DMS
2016-08-29 17:30:31 +02:00
Celine Mercier
8d360b0fac
Minor improvements to obi export command
2016-08-19 17:49:22 +02:00
Celine Mercier
b34769b27c
Minor improvements to obi export command
2016-08-19 17:46:55 +02:00
Celine Mercier
2d0a714e37
Basic obi export command exporting from view to fasta or fastq format,
...
for testing purposes
2016-08-19 17:40:58 +02:00
Celine Mercier
7b780ffb28
View files now have a dynamic size to allow unlimited comments size
2016-08-18 17:57:03 +02:00
Celine Mercier
e4129610cf
Quality columns are now optional in NUC_SEQS views + minor fixes
2016-08-16 15:17:26 +02:00
Celine Mercier
cf839522e7
Minor update and fix to obi grep command
2016-08-12 17:45:44 +02:00
Celine Mercier
10b22f79da
The cython subclass is now correctly chosen when cloning a view
2016-08-12 17:39:19 +02:00
Celine Mercier
ad8e10f2d1
Reworked a bit alignment API
2016-08-12 15:56:07 +02:00
Celine Mercier
92cad61417
Fixed bug when closing views with no associated predicate
2016-08-12 15:52:38 +02:00
Celine Mercier
64a745ce0b
First very basic version of obi grep command
2016-08-11 17:32:08 +02:00
Celine Mercier
2d8ac2b035
Fixed bug when creating an OBI_IDX column
2016-08-11 17:30:32 +02:00
Celine Mercier
5b7917bb5a
Fixed bug when writing predicates in view file
2016-08-11 17:30:09 +02:00
Celine Mercier
d3c58780a0
Added __len__ function do OBIViews that returns the line count
2016-08-10 17:20:23 +02:00
Celine Mercier
029d395da1
Added __iter__ function to OBIView lines
2016-08-10 17:08:22 +02:00
Celine Mercier
bea02cc7a5
Added (temporary?) check for the type of quality strings because the
...
import now seems to return them with bytes type
2016-08-10 16:25:45 +02:00
Celine Mercier
4ba01617af
Fixed obscure compilation bug
2016-08-10 15:26:40 +02:00
Celine Mercier
bec684d5e2
Fixed merge conflict
2016-08-10 15:05:37 +02:00
Celine Mercier
2aaa87edcc
1st version of obi align command and reworked functions that handle
...
column alignment
2016-08-10 14:51:02 +02:00
400a3f9f3d
Merge branch 'Eric_version_for_sequence'
...
Conflicts:
python/obitools3/obidms/_obidmscolumn_seq.pyx
2016-08-04 09:42:42 +02:00
d1d26b9028
Simplify the code
2016-08-04 08:00:54 +02:00
465ea81c77
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2016-08-03 10:13:47 +02:00
1e6d6e32e0
Switch to Cython version >= 0.24
2016-08-03 10:13:10 +02:00
ccc877764e
Patch a bug in the printing of the progress bar leading to a bus error
...
when compiled with some C compilers and Cython >= 0.24
2016-08-03 10:12:23 +02:00
8f0462c407
Merge branch 'master' into Eric_version_for_sequence
...
Conflicts:
python/obitools3/obidms/_obidmscolumn_seq.pyx
2016-08-03 10:09:20 +02:00
Celine Mercier
26b8e1f215
Modified C API to set and get in columns: added functions to set and get
...
using column names instead of pointers, and changed function names
2016-08-02 16:33:19 +02:00
Celine Mercier
312f50ff0f
Major update: Column aliases. Columns are now identified in the context
...
of a view by an alias that can be modified.
2016-08-01 18:25:30 +02:00
Celine Mercier
3843485a04
Deleted deprecated function declaration that would make compilation
...
impossible and fixed error in documentation
2016-07-22 16:21:02 +02:00
Celine Mercier
20425a5d2b
Deleted deprecated structure declarations
2016-07-19 15:48:56 +02:00
Celine Mercier
56e4848ebd
The predicates associated with a view are now described in its comments
...
field
2016-07-19 15:31:21 +02:00
Celine Mercier
8850e40b6e
Minor changes for better presentation
2016-07-19 15:30:17 +02:00
Celine Mercier
b89af38109
Goes with 38718320
2016-07-18 13:57:49 +02:00
Celine Mercier
38718320f9
First version for the association of one column to another. Closes #55
2016-07-15 15:38:49 +02:00
Celine Mercier
8ee85c3005
A first version of predicate functions that are checked when a new view
...
is saved and closed
2016-07-12 14:54:11 +02:00
000b9999ad
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2016-07-03 09:22:22 +02:00
aff9831c13
Substitute fprintf call by fputs call to conform with the new ubuntu
...
compilation rules
2016-07-03 09:21:56 +02:00
448fa8d325
first trial for a fasta formater
2016-07-03 09:18:52 +02:00
6af62d8124
Change a fprintf without argument to a fputs to comply with the new
...
default parameter on ubuntu
2016-07-03 08:25:06 +02:00
Celine Mercier
0869b9ba3f
Closes issue #47 by storing each view in a separate file named with the
...
view's name and created upon view creation.
2016-06-30 11:41:30 +02:00
Celine Mercier
ad2af0b512
Some comments updated
2016-06-16 11:26:54 +02:00
Celine Mercier
38e603ed57
Deleted some redundant cython code
2016-06-10 10:34:47 +02:00
Celine Mercier
f438c3d913
OBIQUAL columns can now handle multiple elements per line
2016-06-09 15:54:36 +02:00
Celine Mercier
2a1ea3ba3f
Setting NA values is now handled properly for OBI_SEQ, OBI_STR and
...
OBI_QUAL columns
2016-06-09 14:22:36 +02:00
Celine Mercier
fc3641d7ff
Read-only AVLs are now hard-linked instead of copied when cloning an AVL
...
group to make it writable. Also fixed several bugs when handling AVL
groups.
2016-06-03 19:02:46 +02:00
Celine Mercier
799b942017
Deleted old debugging print
2016-06-03 18:57:32 +02:00
Celine Mercier
6e3f5b230e
Fixed typo in doc
2016-06-03 18:56:45 +02:00
Celine Mercier
2f57f80c63
Fixed a bug where an unmapped variable would be read
2016-06-03 18:55:58 +02:00
Celine Mercier
2962c4d250
Goes with previous commit
2016-06-03 18:54:25 +02:00
Celine Mercier
69bf7ec2e7
NA value for OBI_STR and OBI_SEQ columns is now NULL
2016-06-03 18:53:22 +02:00
bac7ce7184
Start of the implementation of the export methods
2016-06-02 19:10:33 +02:00
f186395661
Trap potential exception generated by char* to bytes casts
2016-05-29 21:18:20 +02:00
85395dfc1a
value returned for sequence is now bytes and no more str
2016-05-29 13:53:32 +02:00
f830389974
Add some comment on the location of the align method.
2016-05-29 12:58:31 +02:00
2e35229357
Add conversion checking on the value of a seq column
2016-05-29 12:54:13 +02:00
a8ed57dc6e
few small changes
2016-05-21 12:29:55 +02:00
c3274d419c
remove an extra debug log
2016-05-21 12:29:08 +02:00
cca0dbb46b
Close issue #54 by adding a read1 method to the MagicKeyFile class
2016-05-21 12:24:48 +02:00
5a78157112
increase parsing speed of the header
2016-05-21 10:29:11 +02:00
0b9a41d952
Patch a bug about the reading of the last sequence
2016-05-21 10:28:03 +02:00
Celine Mercier
e681ca646d
Fixed a problem with some columns being shorter in views and triggering
...
errors when trying to get values. Temporary fix that needs discussion
2016-05-20 18:45:29 +02:00
Celine Mercier
3b59043ea8
Major update: New column type to store sequence qualities. Closes #41
2016-05-20 16:45:22 +02:00
Celine Mercier
ffff91e76c
Fixed variable name that had been accidentally changed for better
...
clarity
2016-05-18 13:27:41 +02:00
Celine Mercier
6a8df069ad
Indexers are now cloned if needed to modify them after they've been
...
closed. Obligatory indexers' names now follow the same pattern as other
indexers (columnname_version). Closes #46 and #49 .
2016-05-18 13:23:48 +02:00
Celine Mercier
8ae7644945
First version of quality handling (not working yet) and now it is
...
checked that a column is writable before enlarging it
2016-05-11 16:38:14 +02:00
Celine Mercier
b3c47809da
First version of alignment functions (imported from suma* programs)
2016-05-11 16:36:23 +02:00
Celine Mercier
3567681339
Now when a column is added to a view, if there is a line selection, all
...
columns in the view are cloned first
2016-05-11 16:34:20 +02:00
Celine Mercier
757ef8509a
Deleting CeCILL license duplicates
2016-05-09 11:17:45 +02:00
Celine Mercier
f961621f5d
Minor improvements in _obidms Cython layer
2016-05-04 13:43:26 +02:00
Celine Mercier
bc12360490
Reworked and commented a bit the cython layer for dms, columns and views
2016-05-02 15:16:06 +02:00
Celine Mercier
872071b104
Removed a list of column pointers kept in the OBIView class that was not
...
really needed
2016-05-02 14:23:42 +02:00
Celine Mercier
32cc8968e8
Adding CeCILL license
2016-05-02 11:51:59 +02:00
Celine Mercier
d6481f0db8
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2016-04-29 17:46:59 +02:00
Celine Mercier
a32920e401
Relative paths when creating or opening a DMS now work
2016-04-29 17:46:36 +02:00
Celine Mercier
31cf27d676
Added indexer function that returns the name of the indexer
2016-04-29 16:18:56 +02:00
Celine Mercier
baba2d742e
commenting _obidms.pyx
2016-04-29 16:07:03 +02:00
Celine Mercier
5bd12079ae
Added comments about listing columns and indexers in obidms functions
2016-04-29 16:06:01 +02:00
Celine Mercier
072ee5ac03
Re-re-fixed line breaks in README file
2016-04-29 15:44:40 +02:00
Celine Mercier
9fe21316ff
Refixed line breaks in README file
2016-04-29 15:39:46 +02:00
Celine Mercier
3dc3aaa46b
Fixed line breaks in README file
2016-04-29 15:36:58 +02:00
Celine Mercier
b371030edd
Adding README file
2016-04-29 15:35:08 +02:00
Celine Mercier
b3976fa461
Merge branch 'luke_tests'
2016-04-28 11:17:24 +02:00
Celine Mercier
6ea2cfb9ca
Merging luke_tests branch without the commit turning inline functions in macros
2016-04-28 11:17:18 +02:00
Celine Mercier
0eca86107e
Pseudo obihead for tests
2016-04-27 14:27:28 +02:00
Celine Mercier
0de953a3ef
pseudo obigrep for tests
2016-04-27 14:19:55 +02:00
Celine Mercier
f3b20b809d
Fixed bug with indexer names being defined and generating seg fault if
...
creating a column not using indexers
2016-04-27 14:01:36 +02:00
Celine Mercier
d159b921eb
Fixed obi import trying to print all lines at the end (source of
...
segfault?)
2016-04-27 13:14:19 +02:00
Celine Mercier
4e4cf46b16
Added all C files as source files for all cython files to stop having
...
that kind of problem with linux systems
2016-04-27 10:44:24 +02:00
Celine Mercier
6b61533650
Added more C source files for _obiseq
2016-04-27 10:41:00 +02:00
Celine Mercier
419885485b
Added files in _obitaxo C sources for cython
2016-04-27 10:30:16 +02:00
Celine Mercier
0c8504b6db
Commented #ifdef directive for detect_bucket_size function because it
...
causes errors
2016-04-27 10:24:40 +02:00
Celine Mercier celine.mercier@ujf-grenoble.fr
654c34a1a6
changed inline functions to macros to make it work on Luke
2016-04-26 15:40:12 +02:00
Celine Mercier
2d8c06f7b7
Fixed variable initialization for error detection
2016-04-26 14:38:46 +02:00
Celine Mercier
a6c8d35491
import command a bit modified for tests
2016-04-26 14:29:54 +02:00
Celine Mercier
366264828e
Renamed MurmurHash2.c file to murmurhash2.c as it could be a problem
2016-04-26 14:29:17 +02:00
Celine Mercier
d3a6ff6043
Removed deprecated code
2016-04-26 14:27:16 +02:00
Celine Mercier
5ca84b91dc
Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools3.git
2016-04-25 18:35:57 +02:00
Celine Mercier
87935c6678
Fixed all compilation problems with new function names, locations etc
2016-04-25 18:35:02 +02:00
Celine Mercier
92980508c0
Made the function to clone a column in the context of a view private
2016-04-25 18:15:25 +02:00
Celine Mercier
65880db422
Made function to update the line count of a view private
2016-04-25 18:11:37 +02:00
Celine Mercier
767d9c7804
Reordered view functions for better coherence
2016-04-25 18:07:58 +02:00
Celine Mercier
2566377e2a
Updated the documentation for utils functions
2016-04-25 18:02:58 +02:00
Celine Mercier
1fbbdd43f9
Updated obiversion_t declaration
2016-04-25 17:58:37 +02:00
Celine Mercier
8cdfbb379e
Documentation for views and reworked the code a little
2016-04-25 17:58:12 +02:00
Celine Mercier
0a55e26520
Reworked obiview code and added more comments
2016-04-25 11:37:53 +02:00
Celine Mercier
68a8509c12
Updated documentation in obitypes.h
2016-04-25 10:33:01 +02:00
Celine Mercier
5f98d2ed5c
Fixed the calculation of the size of data for OBI_STR and OBI_SEQ
...
columns
2016-04-25 10:26:51 +02:00
ef1be141c1
Update Licence to english version
2016-04-23 18:03:50 +02:00
bbfd40d56d
Add license
2016-04-23 18:03:10 +02:00
Celine Mercier
5d08da46a2
Updated the documentation in obidmscolumn.h
2016-04-22 17:55:53 +02:00
Celine Mercier
66045acf1d
Creating a column now uses the function to create the indexer name if
...
one was not provided
2016-04-22 17:47:00 +02:00
Celine Mercier
6977c4315c
Improved function to build an indexer name
2016-04-22 17:38:23 +02:00
Celine Mercier
839b3000a8
Added a function to build indexer names
2016-04-22 17:08:23 +02:00
Celine Mercier
ffa4557928
changed MAP_PRIVATE flags to MAP_SHARED when opening a column because it
...
seems a lot more efficient
2016-04-22 16:26:24 +02:00
Celine Mercier
003cd11362
Fixed initialization of NA values for OBI_STR and OBI_SEQ columns
2016-04-22 16:14:23 +02:00
Celine Mercier
c87227b65a
Uncommented an error message that doesn't need to be commented anymore
2016-04-22 16:11:56 +02:00
Celine Mercier
c07e75f2ac
Updated the documentation for OBI_STR columns
2016-04-22 15:59:32 +02:00
Celine Mercier
6b394a5cf7
Updated the documentation for OBI_SEQ columns
2016-04-22 15:58:20 +02:00
Celine Mercier
2416b8ccd8
Deleted more unused inclusions in OBI_STR and OBI_SEQ column types code
2016-04-22 15:56:09 +02:00
Celine Mercier
b9921e111d
Removed unused inclusions and definitions in all column types code
2016-04-22 15:50:19 +02:00
Celine Mercier
8f5aa8841d
Removed unused definition in OBI_IDX columns code
2016-04-22 15:44:30 +02:00
Celine Mercier
900d67de87
Updated the documentation for columns with the type OBI_IDX
2016-04-22 15:43:39 +02:00
Celine Mercier
22e3c3eeed
Updated the documentation for obidms functions
2016-04-22 11:28:09 +02:00
Celine Mercier
4ead37ee48
Finished moving obiblob functions to obiblob files and documentation for
...
obiblob functions
2016-04-21 15:18:14 +02:00
Celine Mercier
bce360bbd5
Documentation for obiblob indexer API
2016-04-21 15:08:40 +02:00
Celine Mercier
2a68cb26f8
Improved AVL tree documentation
2016-04-21 15:07:27 +02:00
Celine Mercier
043e70ff49
Updated AVL documentation
2016-04-21 14:39:03 +02:00
Celine Mercier
66021367f6
Moved some blob functions to obiblob.c
2016-04-21 14:20:26 +02:00
Celine Mercier
e69f44ae3d
Little annotations for the murmur hash function.
2016-04-21 13:53:29 +02:00
Celine Mercier
1941a3785e
Updated encode functions documentation
2016-04-21 13:46:02 +02:00
Celine Mercier
c7b8db6a2e
Replaced malloc+memset with calloc
2016-04-21 13:45:39 +02:00
Celine Mercier
1dc4a3be49
Documentation for DNA sequence indexing functions
2016-04-21 13:36:51 +02:00
Celine Mercier
09597016fd
Short doc for crc function
2016-04-21 13:23:52 +02:00
Celine Mercier
1a2fa0923c
Documented the functions indexing and retrieving character strings
2016-04-21 11:35:21 +02:00
Celine Mercier
00f2f2cc51
Documented changes made in bloom functions
2016-04-21 11:22:31 +02:00
Celine Mercier
7a88ca619a
First obi import (doesn't import tags yet because NA values aren't
...
handled)
2016-04-15 17:00:08 +02:00
Celine Mercier
eddd19a245
Changes in obi commands
2016-04-15 16:59:21 +02:00
Celine Mercier
2aafecc3b5
Changed sequence 'description' to 'definition' everywhere
2016-04-15 16:31:43 +02:00
Celine Mercier
094b2371e9
Deleted obsolete directory
2016-04-15 14:44:31 +02:00
Celine Mercier
c1034d300d
merging and fixed git conflict with obiavl.h
2016-04-15 13:23:29 +02:00
Celine Mercier
02d67c257f
The default name of an AVL is now the column name + '_indexer', and when
...
an AVL is opened (as opposed to created), it is read-only
2016-04-15 12:55:26 +02:00
Celine Mercier
e04ea85d1e
Fixed problematic __str__ method and useless declarations in the
...
OBI_Nuc_Seq_Stored class
2016-04-15 11:22:05 +02:00
Celine Mercier
527d3555f0
Moved the functions getting full paths for files and directories to
...
obidms.c/.h files
2016-04-15 11:11:13 +02:00
Celine Mercier
71492ad229
Made the handling of listing and unlisting opened columns and indexers
...
functions in the obidms files.
2016-04-15 10:49:12 +02:00
Celine Mercier
73d64e5aff
Renamed 'unmap_header' function to 'close_header'
2016-04-14 15:19:27 +02:00
Celine Mercier
4cb52e1632
Made the truncating of columns automatic when closing them (note:
...
already the case for AVLs)
2016-04-14 15:13:30 +02:00
Celine Mercier
9d042f7bd0
Refactored and relocated the set and get functions of all column types,
...
both within and out of the context of a view
2016-04-13 15:10:24 +02:00
Celine Mercier
5ec2d8842e
Character string indexer API
2016-04-12 17:21:01 +02:00
Celine Mercier
04c9470f7d
Fixed and cleaned DNA_seq_indexer API
2016-04-12 17:20:24 +02:00
Celine Mercier
be05c889e2
DNA_seq_indexer API
2016-04-12 16:38:47 +02:00
Celine Mercier
04e3a7b5a9
Added more references in cython .cfiles files because it seems necessary
...
for linux distributions
2016-04-12 15:10:54 +02:00
Celine Mercier
d8107533d8
Obiblob_indexer API
2016-04-12 14:53:33 +02:00
Celine Mercier
cd4e65e190
Fixed typo and includes in obiblob files
2016-04-12 14:52:27 +02:00
Celine Mercier
375bfcce8a
Renamed "Obi_byte_arrays" to "Obiblobs" and moved Obiblob functions to
...
separate obiblob.c and obiblob.h files
2016-04-12 11:21:14 +02:00
Celine Mercier
c225cfd8b6
Fixed bug with retrieval of values from AVLs (bad cast in byte array
...
structure)
2016-04-11 17:07:22 +02:00
6fe4c6134a
Allows for calling getConfiguration without parametter for geting the
...
default configuration
2016-04-11 13:31:09 +02:00
Celine Mercier
966b1325ed
Deleted declaration of obsolete public function
2016-04-11 11:14:20 +02:00
Celine Mercier
019dfc01b4
Branch to refactor and debug (AVLs bugged)
2016-04-08 15:38:57 +02:00
45c9c5075c
A first version of the fasta parser
2016-04-01 18:15:54 +02:00
20b97c972b
Add boolean type in the tag evaluation
2016-04-01 13:42:24 +02:00
efc4a4a3c6
Reduce the call count to eval. This reduce by 3 the time of fast(q|a)
...
header processing
2016-04-01 08:54:06 +02:00
ce6ea89c21
Add the missing bootstrappip module
2016-03-31 17:28:03 +02:00
4207db7c17
Transfers bug patch from orgasm
2016-03-31 16:53:09 +02:00
1cd35b3359
firt version of a fastq parser
2016-03-31 10:47:12 +02:00
f51a6df5b2
Add a class buffering lines during a text file reading
2016-03-30 14:53:25 +02:00
94417e1330
patch the uncompress module to be able to deal with remote file
2016-03-29 20:57:39 +02:00
2e17dbce55
Adds a uopen function able to open transparently a local or a remote
...
file compressed or not
2016-03-29 20:56:54 +02:00
a9eed1f5d9
Adds class for uncompressing transparently compressed files on line
2016-03-29 18:21:04 +02:00
2dfab3f378
Some changes in relation with the new obitools3.apps module
2016-03-28 15:05:59 +02:00
e583098a96
change in the obi programme according to the new obitools3.apps module
...
creation
2016-03-28 15:05:02 +02:00
b926ca3997
A template for a command
2016-03-28 15:04:06 +02:00
aacfefad26
A set of utilitaty function for creating commands
2016-03-28 15:03:26 +02:00
Celine Mercier
edc4fd7b3e
Fixed minor warning
2016-03-25 16:11:52 +01:00
2c084c8cf7
Switch to 10000000 per avl
2016-03-23 16:13:28 +01:00