From 389d0a23709f9e83cddf639976e07e11f185c7f2 Mon Sep 17 00:00:00 2001
From: Benjamin Buchfink <buchfink@gmail.com>
Date: Thu, 23 Jan 2025 16:52:00 +0100
Subject: [PATCH] Squashed commit of the following:

commit fbb90ae0240d1ce8df6ae85cabdafb45f9c31295
Author: Benjamin Buchfink <buchfink@gmail.com>
Date:   Thu Jan 23 16:45:01 2025 +0100

    Fixed band computation

commit 425995262ad5bc3eec9e9e433c050c01566eda8b
Author: Benjamin Buchfink <buchfink@gmail.com>
Date:   Thu Jan 23 16:01:42 2025 +0100

    Updated version

commit 8ba6f97e5fc13a699766144f6a1f0a4f9416141a
Merge: 181c38bd 3c79feca
Author: Benjamin Buchfink <buchfink@gmail.com>
Date:   Thu Jan 23 15:20:42 2025 +0100

    Merge branch 'master' into dev
---
 .github/workflows/cmake.yml | 2 +-
 src/align/gapped_score.cpp  | 4 ++--
 src/basic/basic.cpp         | 2 +-
 src/basic/const.h           | 2 +-
 src/run/config.h            | 2 +-
 src/test/test_cases.cpp     | 2 +-
 src/util/string/string.cpp  | 1 +
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 4645faa3..8f2cdec3 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         # runner image list, https://github.com/actions/runner-images
-        os: [ ubuntu-24.04, macos-14-large, macos-14 ]
+        os: [ ubuntu-24.04, macos-14 ]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/src/align/gapped_score.cpp b/src/align/gapped_score.cpp
index a3c93f0f..3347c80a 100644
--- a/src/align/gapped_score.cpp
+++ b/src/align/gapped_score.cpp
@@ -73,9 +73,9 @@ int band(int len, const Mode mode) {
 }
 
 static int hsp_band(int base_band, int qlen, int tlen, const ApproxHsp& hsp) {
-	if (!config.classic_band) {
+	/*if (!config.classic_band) {
 		return std::max(Loc((hsp.d_max - hsp.d_min) * 0.15), 32);
-	}
+	}*/
 	if (config.narrow_band_cov == 0.0)
 		return base_band;
 	if ((double)hsp.query_range.length() / qlen >= config.narrow_band_cov
diff --git a/src/basic/basic.cpp b/src/basic/basic.cpp
index 3f0d811f..6ce5df55 100644
--- a/src/basic/basic.cpp
+++ b/src/basic/basic.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "stats/standard_matrix.h"
 #include "util/log_stream.h"
 
-const char* Const::version_string = "2.1.10";
+const char* Const::version_string = "2.1.11";
 using std::string;
 using std::vector;
 using std::count;
diff --git a/src/basic/const.h b/src/basic/const.h
index 7ee0cd65..226cec3f 100644
--- a/src/basic/const.h
+++ b/src/basic/const.h
@@ -25,7 +25,7 @@ struct Const
 {
 
 	enum {
-		build_version = 164,
+		build_version = 165,
 		max_seed_weight = 32,
 		max_shapes = 64
 	};
diff --git a/src/run/config.h b/src/run/config.h
index affd62ca..245d7064 100644
--- a/src/run/config.h
+++ b/src/run/config.h
@@ -64,7 +64,7 @@ struct Round {
 		linearize(lin)
 	{}
 	bool operator<(Round r) const {
-		return linearize && !r.linearize || (linearize == r.linearize && sensitivity < r.sensitivity);
+		return (linearize && !r.linearize) || (linearize == r.linearize && sensitivity < r.sensitivity);
 	}
 	bool operator==(Round r) const {
 		return sensitivity == r.sensitivity && linearize == r.linearize;
diff --git a/src/test/test_cases.cpp b/src/test/test_cases.cpp
index 38ae140d..eab1a2af 100644
--- a/src/test/test_cases.cpp
+++ b/src/test/test_cases.cpp
@@ -66,7 +66,7 @@ const vector<uint64_t> ref_hashes = {
 0xe787dcb23cc5b120,
 0x5aa4baf48a888be9,
 0xa2519e06e3bfa2fd,
-0x2b827bdfa26faa1,
+0x2c355eaec8aea91,
 0x67b3a14cdd541dc3,
 };
 
diff --git a/src/util/string/string.cpp b/src/util/string/string.cpp
index 18b371c7..552988bf 100644
--- a/src/util/string/string.cpp
+++ b/src/util/string/string.cpp
@@ -2,6 +2,7 @@
 #include <iomanip>
 #include <stdexcept>
 #include <limits.h>
+#include <stdint.h>
 #include <limits>
 #include "string.h"