Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/soedinglab/MMseqs2

  • Loading branch information...
Martin Steinegger
Martin Steinegger committed Aug 14, 2019
2 parents 27d58e9 + 57c994c commit 49289bd27edffb4e6af0f9b60a70cf9976da8b3f
Showing with 7 additions and 1 deletion.
  1. +6 −0 .travis.yml
  2. +1 −0 data/cascaded_clustering.sh
  3. +0 −1 src/commons/DBReader.cpp
@@ -24,6 +24,7 @@ matrix:
- zlib1g-dev
- libbz2-dev
- vim-common
- shellcheck
env: CC=clang-3.6 CXX=clang++-3.6
- os: linux
dist: trusty
@@ -41,6 +42,7 @@ matrix:
- zlib1g-dev
- libbz2-dev
- vim-common
- shellcheck
env: CC=clang-7 CXX=clang++-7
- os: linux
dist: trusty
@@ -54,6 +56,7 @@ matrix:
- zlib1g-dev
- libbz2-dev
- vim-common
- shellcheck
env: CC=gcc-4.8 CXX=g++-4.8
- os: linux
dist: trusty
@@ -69,6 +72,7 @@ matrix:
- zlib1g-dev
- libbz2-dev
- vim-common
- shellcheck
env: CC=gcc-8 CXX=g++-8
- os: linux
dist: trusty
@@ -85,6 +89,7 @@ matrix:
- libbz2-dev
- vim-common
- libopenmpi-dev
- shellcheck
env: MPI=1 CC=gcc-8 CXX=g++-8
- os: osx
osx_image: xcode10.1
@@ -96,6 +101,7 @@ matrix:
- gcc@8
- zlib
- bzip2
- shellcheck
env: CC=gcc-8 CXX=g++-8
allow_failures:
- env: QEMU_ARM=1
@@ -182,6 +182,7 @@ if [ -n "$REASSIGN" ]; then
fi

if notExists "${TMP_PATH}/missing.single.seqs.db.dbtype"; then
# shellcheck disable=SC2086
"$MMSEQS" prefixid "${TMP_PATH}/clu_accepted_plus_wrong" "${TMP_PATH}/clu_accepted_plus_wrong.tsv" --tsv 1 ${THREADSANDCOMPRESS}
awk 'FNR==NR{f[$2]=1; next} !($1 in f){print $1"\t"$1}' "${TMP_PATH}/clu_accepted_plus_wrong.tsv" "${SOURCE}.index" > "${TMP_PATH}/missing.single.seqs"
# shellcheck disable=SC2086
@@ -913,7 +913,6 @@ template<typename T>
size_t DBReader<T>::findNextOffsetid(size_t id) {
size_t idOffset = getOffset(id);
size_t nextOffset = SIZE_MAX;
size_t maxOffset = 0;
for(size_t i = 0; i < size; i++){
if(index[i].offset > idOffset && index[i].offset < nextOffset){
nextOffset=index[i].offset;

0 comments on commit 49289bd

Please sign in to comment.
You can’t perform that action at this time.