Skip to content

Commit 389d0a2

Browse files
committed
Squashed commit of the following:
commit fbb90ae0240d1ce8df6ae85cabdafb45f9c31295 Author: Benjamin Buchfink <[email protected]> Date: Thu Jan 23 16:45:01 2025 +0100 Fixed band computation commit 425995262ad5bc3eec9e9e433c050c01566eda8b Author: Benjamin Buchfink <[email protected]> Date: Thu Jan 23 16:01:42 2025 +0100 Updated version commit 8ba6f97e5fc13a699766144f6a1f0a4f9416141a Merge: 181c38bd 3c79fec Author: Benjamin Buchfink <[email protected]> Date: Thu Jan 23 15:20:42 2025 +0100 Merge branch 'master' into dev
1 parent 3c79fec commit 389d0a2

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
# runner image list, https://github.com/actions/runner-images
26-
os: [ ubuntu-24.04, macos-14-large, macos-14 ]
26+
os: [ ubuntu-24.04, macos-14 ]
2727

2828
steps:
2929
- uses: actions/checkout@v2

src/align/gapped_score.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ int band(int len, const Mode mode) {
7373
}
7474

7575
static int hsp_band(int base_band, int qlen, int tlen, const ApproxHsp& hsp) {
76-
if (!config.classic_band) {
76+
/*if (!config.classic_band) {
7777
return std::max(Loc((hsp.d_max - hsp.d_min) * 0.15), 32);
78-
}
78+
}*/
7979
if (config.narrow_band_cov == 0.0)
8080
return base_band;
8181
if ((double)hsp.query_range.length() / qlen >= config.narrow_band_cov

src/basic/basic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2929
#include "stats/standard_matrix.h"
3030
#include "util/log_stream.h"
3131

32-
const char* Const::version_string = "2.1.10";
32+
const char* Const::version_string = "2.1.11";
3333
using std::string;
3434
using std::vector;
3535
using std::count;

src/basic/const.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct Const
2525
{
2626

2727
enum {
28-
build_version = 164,
28+
build_version = 165,
2929
max_seed_weight = 32,
3030
max_shapes = 64
3131
};

src/run/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct Round {
6464
linearize(lin)
6565
{}
6666
bool operator<(Round r) const {
67-
return linearize && !r.linearize || (linearize == r.linearize && sensitivity < r.sensitivity);
67+
return (linearize && !r.linearize) || (linearize == r.linearize && sensitivity < r.sensitivity);
6868
}
6969
bool operator==(Round r) const {
7070
return sensitivity == r.sensitivity && linearize == r.linearize;

src/test/test_cases.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const vector<uint64_t> ref_hashes = {
6666
0xe787dcb23cc5b120,
6767
0x5aa4baf48a888be9,
6868
0xa2519e06e3bfa2fd,
69-
0x2b827bdfa26faa1,
69+
0x2c355eaec8aea91,
7070
0x67b3a14cdd541dc3,
7171
};
7272

src/util/string/string.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <iomanip>
33
#include <stdexcept>
44
#include <limits.h>
5+
#include <stdint.h>
56
#include <limits>
67
#include "string.h"
78

0 commit comments

Comments
 (0)