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

C: Changed obibool definitions because of conflict with R

Browse Source
This commit is contained in:
Celine Mercier
2020-01-06 15:11:31 +01:00
parent b1f3e082f9
commit b9cd9bee9a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/obitypes.h
View File

@ -34,8 +34,8 @@
* @brief enum for the boolean OBIType. * @brief enum for the boolean OBIType.
*/ */
typedef enum OBIBool { typedef enum OBIBool {
FALSE = 0, OBIFalse = 0,
TRUE = 1, OBITrue = 1,
OBIBool_NA = 2 OBIBool_NA = 2
} obibool_t, *obibool_p; /**< a boolean true/false value */ // TODO check name convention? } obibool_t, *obibool_p; /**< a boolean true/false value */ // TODO check name convention?

16
src/sse_banded_LCS_alignment.c
View File

@ -951,15 +951,15 @@ double generic_sse_banded_lcs_align(char* seq1, char* seq2, double threshold, bo
// Put the DNA sequences in the int arrays. Longest sequence must be first argument of sse_align function // Put the DNA sequences in the int arrays. Longest sequence must be first argument of sse_align function
if (l2 > l1) if (l2 > l1)
{ {
putSeqInSeq(iseq1, seq2, l2, TRUE); putSeqInSeq(iseq1, seq2, l2, true);
putSeqInSeq(iseq2, seq1, l1, FALSE); putSeqInSeq(iseq2, seq1, l1, false);
// Compute alignment // Compute alignment
id = sse_banded_lcs_align(iseq1, iseq2, l2, l1, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length); id = sse_banded_lcs_align(iseq1, iseq2, l2, l1, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length);
} }
else else
{ {
putSeqInSeq(iseq1, seq1, l1, TRUE); putSeqInSeq(iseq1, seq1, l1, true);
putSeqInSeq(iseq2, seq2, l2, FALSE); putSeqInSeq(iseq2, seq2, l2, false);
// Compute alignment // Compute alignment
id = sse_banded_lcs_align(iseq1, iseq2, l1, l2, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length); id = sse_banded_lcs_align(iseq1, iseq2, l1, l2, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length);
} }
@ -1054,15 +1054,15 @@ double obiblob_sse_banded_lcs_align(Obi_blob_p seq1, Obi_blob_p seq2, double thr
// Put the DNA sequences in the int arrays. Longest sequence must be first argument of sse_align function // Put the DNA sequences in the int arrays. Longest sequence must be first argument of sse_align function
if (l2 > l1) if (l2 > l1)
{ {
putBlobInSeq(iseq1, seq2, l2, TRUE); putBlobInSeq(iseq1, seq2, l2, true);
putBlobInSeq(iseq2, seq1, l1, FALSE); putBlobInSeq(iseq2, seq1, l1, false);
// Compute alignment // Compute alignment
id = sse_banded_lcs_align(iseq1, iseq2, l2, l1, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length); id = sse_banded_lcs_align(iseq1, iseq2, l2, l1, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length);
} }
else else
{ {
putBlobInSeq(iseq1, seq1, l1, TRUE); putBlobInSeq(iseq1, seq1, l1, true);
putBlobInSeq(iseq2, seq2, l2, FALSE); putBlobInSeq(iseq2, seq2, l2, false);
// Compute alignment // Compute alignment
id = sse_banded_lcs_align(iseq1, iseq2, l1, l2, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length); id = sse_banded_lcs_align(iseq1, iseq2, l1, l2, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length);
} }