From b9cd9bee9afceb4fd4370d4aec34c48d8300cc5d Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Mon, 6 Jan 2020 15:11:31 +0100 Subject: [PATCH] C: Changed obibool definitions because of conflict with R --- src/obitypes.h | 4 ++-- src/sse_banded_LCS_alignment.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/obitypes.h b/src/obitypes.h index 8d72880..f7e4441 100755 --- a/src/obitypes.h +++ b/src/obitypes.h @@ -34,8 +34,8 @@ * @brief enum for the boolean OBIType. */ typedef enum OBIBool { - FALSE = 0, - TRUE = 1, + OBIFalse = 0, + OBITrue = 1, OBIBool_NA = 2 } obibool_t, *obibool_p; /**< a boolean true/false value */ // TODO check name convention? diff --git a/src/sse_banded_LCS_alignment.c b/src/sse_banded_LCS_alignment.c index eab489b..63652ea 100755 --- a/src/sse_banded_LCS_alignment.c +++ b/src/sse_banded_LCS_alignment.c @@ -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 if (l2 > l1) { - putSeqInSeq(iseq1, seq2, l2, TRUE); - putSeqInSeq(iseq2, seq1, l1, FALSE); + putSeqInSeq(iseq1, seq2, l2, true); + putSeqInSeq(iseq2, seq1, l1, false); // Compute alignment id = sse_banded_lcs_align(iseq1, iseq2, l2, l1, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length); } else { - putSeqInSeq(iseq1, seq1, l1, TRUE); - putSeqInSeq(iseq2, seq2, l2, FALSE); + putSeqInSeq(iseq1, seq1, l1, true); + putSeqInSeq(iseq2, seq2, l2, false); // Compute alignment 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 if (l2 > l1) { - putBlobInSeq(iseq1, seq2, l2, TRUE); - putBlobInSeq(iseq2, seq1, l1, FALSE); + putBlobInSeq(iseq1, seq2, l2, true); + putBlobInSeq(iseq2, seq1, l1, false); // Compute alignment id = sse_banded_lcs_align(iseq1, iseq2, l2, l1, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length); } else { - putBlobInSeq(iseq1, seq1, l1, TRUE); - putBlobInSeq(iseq2, seq2, l2, FALSE); + putBlobInSeq(iseq1, seq1, l1, true); + putBlobInSeq(iseq2, seq2, l2, false); // Compute alignment id = sse_banded_lcs_align(iseq1, iseq2, l1, l2, normalize, reference, similarity_mode, address, LCSmin, lcs_length, ali_length); }