Skip to content

Commit d4a7feb

Browse files
committed
v1.4.3
1 parent f81291c commit d4a7feb

5 files changed

Lines changed: 37 additions & 37 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "abPOA"]
22
path = abPOA
33
url = https://github.com/yangao07/abPOA.git
4-
ignore=dirty
4+
ignore = dirty

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
[![GitHub Downloads](https://img.shields.io/github/downloads/yangao07/TideHunter/total.svg?style=social&logo=github&label=Download)](https://github.com/yangao07/TideHunter/releases)
1111
-->
1212

13-
## Updates (v1.4.2)
14-
* Fixed a bug in calculation of `aveMatch`
13+
## Updates (v1.4.3)
14+
* Update to the latest abPOA
1515

1616

1717
## Getting started
1818
Download the [latest release](https://github.com/yangao07/TideHunter/releases):
1919
```
20-
wget https://github.com/yangao07/TideHunter/releases/download/v1.4.2/TideHunter-v1.4.2.tar.gz
21-
tar -zxvf TideHunter-v1.4.2.tar.gz && cd TideHunter-v1.4.2
20+
wget https://github.com/yangao07/TideHunter/releases/download/v1.4.3/TideHunter-v1.4.3.tar.gz
21+
tar -zxvf TideHunter-v1.4.3.tar.gz && cd TideHunter-v1.4.3
2222
```
2323
Make from source and run with test data:
2424
```
@@ -76,9 +76,9 @@ Make sure you have gcc (>=6.4.0) and zlib installed before compiling.
7676
It is recommended to download the latest release of TideHunter
7777
from the [release page](https://github.com/yangao07/TideHunter/releases).
7878
```
79-
wget https://github.com/yangao07/TideHunter/releases/download/v1.4.2/TideHunter-v1.4.2.tar.gz
80-
tar -zxvf TideHunter-v1.4.2.tar.gz
81-
cd TideHunter-v1.4.2; make
79+
wget https://github.com/yangao07/TideHunter/releases/download/v1.4.3/TideHunter-v1.4.3.tar.gz
80+
tar -zxvf TideHunter-v1.4.3.tar.gz
81+
cd TideHunter-v1.4.3; make
8282
```
8383
Or, you can use `git clone` command to download the source code.
8484
Don't forget to include the `--recursive` to download the codes of [abPOA](https://github.com/yangao07/abPOA).
@@ -91,8 +91,8 @@ cd TideHunter; make
9191
### <a name="binary"></a>Pre-built binary executable file for Linux/Unix
9292
If you meet any compiling issue, please try the pre-built binary file:
9393
```
94-
wget https://github.com/yangao07/TideHunter/releases/download/v1.4.2/TideHunter-v1.4.2_x64-linux.tar.gz
95-
tar -zxvf TideHunter-v1.4.2_x64-linux.tar.gz
94+
wget https://github.com/yangao07/TideHunter/releases/download/v1.4.3/TideHunter-v1.4.3_x64-linux.tar.gz
95+
tar -zxvf TideHunter-v1.4.3_x64-linux.tar.gz
9696
```
9797

9898
## <a name="start"></a>Getting started with toy example in `test_data`

abPOA

Submodule abPOA updated 91 files

src/abpoa_cons.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int abpoa_gen_cons(abpoa_t *ab, abpoa_para_t *abpt, uint8_t *bseqs, int seq_len,
5252
for (i = 0; i < cons_len; ++i) cons_bseq[i] = _bseqs[0][i];
5353
} else {
5454
uint8_t **_cons_bseq; int *_cons_l, _cons_n = 0;
55-
abpoa_msa(ab, abpt, seq_n, seq_lens, _bseqs, NULL, &_cons_bseq, &_cons_l, &_cons_n, NULL, NULL);
55+
abpoa_msa(ab, abpt, seq_n, NULL, seq_lens, _bseqs, NULL, &_cons_bseq, NULL, &_cons_l, &_cons_n, NULL, NULL);
5656
if (_cons_n == 1) {
5757
for (i = 0; i < _cons_l[0]; ++i) cons_bseq[i] = _cons_bseq[0][i];
5858
cons_len = _cons_l[0];
@@ -61,7 +61,7 @@ int abpoa_gen_cons(abpoa_t *ab, abpoa_para_t *abpt, uint8_t *bseqs, int seq_len,
6161
}
6262
}
6363
#else
64-
abpoa_msa(ab, abpt, seq_n, seq_lens, _bseqs, stderr, NULL, NULL, NULL, NULL, NULL);
64+
abpoa_msa(ab, abpt, seq_n, NULL, seq_lens, _bseqs, stderr, NULL, NULL, NULL, NULL, NULL, NULL);
6565
#endif
6666

6767
free(seq_lens); free(_bseqs);

src/main.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "kseq.h"
1111

1212
const char PROG[20] = "TideHunter";
13-
const char VERSION[20] = "1.4.2";
13+
const char VERSION[20] = "1.4.3";
1414
const char CONTACT[30] = "yangao07@hit.edu.cn";
1515

1616
const struct option mini_tandem_opt [] = {
@@ -76,22 +76,22 @@ static int usage(void)
7676

7777
err_printf("Options: \n");
7878
err_printf(" Seeding:\n");
79-
err_printf(" -k --kmer-length INT k-mer length (no larger than %d). [%d]\n", MAX_KMER_SIZE, KMER_SIZE);
80-
err_printf(" -w --window-size INT window size. [%d]\n", KMER_WSIZE);
81-
err_printf(" -s --step-size INT step size. [%d]\n", KMER_SSIZE);
82-
//err_printf(" -m --minimal-m [INT] number of minimal k-mer to keep in each window. [%d]\n", KMER_MINM);
83-
err_printf(" -H --HPC-kmer use homopolymer-compressed k-mer. [False]\n");
79+
err_printf(" -k --kmer-length INT k-mer length (no larger than %d) [%d]\n", MAX_KMER_SIZE, KMER_SIZE);
80+
err_printf(" -w --window-size INT window size [%d]\n", KMER_WSIZE);
81+
err_printf(" -s --step-size INT step size [%d]\n", KMER_SSIZE);
82+
//err_printf(" -m --minimal-m [INT] number of minimal k-mer to keep in each window [%d]\n", KMER_MINM);
83+
err_printf(" -H --HPC-kmer use homopolymer-compressed k-mer [False]\n");
8484

8585
//err_printf("\n");
8686

8787
err_printf(" Tandem repeat criteria:\n");
8888
// TODO min_copy < 2 ???
89-
err_printf(" -c --min-copy INT minimum copy number of tandem repeat. [%d]\n", MIN_COPY);
90-
err_printf(" -e --max-diverg INT maximum allowed divergence rate between two consecutive repeats. [%.2f]\n", MAX_DIV);
91-
err_printf(" -p --min-period INT minimum period size of tandem repeat. (>=%u) [%u]\n", MIN_PERIOD, DEF_MIN_PERIOD);
92-
err_printf(" -P --max-period INT maximum period size of tandem repeat. (<=%u) [%s]\n", MAX_PERIOD, DEF_MAX_PERIOD_STR);
89+
err_printf(" -c --min-copy INT minimum copy number of tandem repeat [%d]\n", MIN_COPY);
90+
err_printf(" -e --max-diverg INT maximum allowed divergence rate between two consecutive repeats [%.2f]\n", MAX_DIV);
91+
err_printf(" -p --min-period INT minimum period size of tandem repeat (>=%u) [%u]\n", MIN_PERIOD, DEF_MIN_PERIOD);
92+
err_printf(" -P --max-period INT maximum period size of tandem repeat (<=%u) [%s]\n", MAX_PERIOD, DEF_MAX_PERIOD_STR);
9393

94-
// err_printf(" -r --rep-range [INT] maximum range to find tandem repeat. [%d]\n", REP_RANGE);
94+
// err_printf(" -r --rep-range [INT] maximum range to find tandem repeat [%d]\n", REP_RANGE);
9595
// err_printf(" (-1: no limit, tandem repeat can span the whole sequence)\n");
9696
//err_printf("\n");
9797

@@ -105,32 +105,32 @@ static int usage(void)
105105
err_printf(" - affine (set O2 as 0): O1+g*E1\n");
106106
err_printf(" - linear (set O1 as 0): g*E1\n");
107107
err_printf(" Adapter sequence:\n");
108-
err_printf(" -5 --five-prime STR 5' adapter sequence (sense strand). [NULL]\n");
109-
err_printf(" -3 --three-prime STR 3' adapter sequence (anti-sense strand). [NULL]\n");
110-
err_printf(" -a --ada-mat-rat FLT minimum match ratio of adapter sequence. [%.2f]\n", ADA_MATCH_RAT);
108+
err_printf(" -5 --five-prime STR 5' adapter sequence (sense strand) [NULL]\n");
109+
err_printf(" -3 --three-prime STR 3' adapter sequence (anti-sense strand) [NULL]\n");
110+
err_printf(" -a --ada-mat-rat FLT minimum match ratio of adapter sequence [%.2f]\n", ADA_MATCH_RAT);
111111

112112
//err_printf("\n");
113113

114114
err_printf(" Output:\n");
115-
err_printf(" -o --output STR output file. [stdout]\n");
116-
err_printf(" -u --unit-seq only output the unit sequences of each tandem repeat, no consensus sequence. [False]\n");
117-
err_printf(" -l --longest only output the consensus sequence of the tandem repeat that covers the longest read sequence. [False]\n");
118-
err_printf(" -F --full-len only output full-length consensus sequence. [False]\n");
119-
err_printf(" -f --out-fmt INT output format. [%d]\n", FASTA_FMT);
115+
err_printf(" -o --output STR output file [stdout]\n");
116+
err_printf(" -u --unit-seq only output the unit sequences of each tandem repeat, no consensus sequence [False]\n");
117+
err_printf(" -l --longest only output the consensus sequence of the tandem repeat that covers the longest read sequence [False]\n");
118+
err_printf(" -F --full-len only output full-length consensus sequence [False]\n");
119+
err_printf(" -f --out-fmt INT output format [%d]\n", FASTA_FMT);
120120
err_printf(" - %d: FASTA\n", FASTA_FMT);
121121
err_printf(" - %d: Tabular\n", TAB_FMT);
122-
//err_printf(" -S --splint-seq STR splint sequence in FASTA/FASTQ format. [NULL]\n");
123-
//err_printf(" -d --detail-out STR detailed information of each consensus. [NULL]\n");
122+
//err_printf(" -S --splint-seq STR splint sequence in FASTA/FASTQ format [NULL]\n");
123+
//err_printf(" -d --detail-out STR detailed information of each consensus [NULL]\n");
124124
//err_printf(" (start, end, score, etc.)\n");
125125

126126
//err_printf("\n");
127127

128128
err_printf(" Computing resource:\n");
129-
err_printf(" -t --thread INT number of threads to use. [%d]\n\n", THREAD_N);
129+
err_printf(" -t --thread INT number of threads to use [%d]\n\n", THREAD_N);
130130

131131
err_printf(" General options:\n");
132-
err_printf(" -h --help print this help usage information.\n");
133-
err_printf(" -v --version show version number.\n");
132+
err_printf(" -h --help print this help usage information\n");
133+
err_printf(" -v --version show version number\n");
134134

135135
err_printf("\n");
136136
return 1;

0 commit comments

Comments
 (0)