Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/smith-waterman-compare-semantics'

Browse source 
* origin/topic/timw/smith-waterman-compare-semantics:
  Fix smith-waterman sorting to follow correct Compare semantics
This commit is contained in:
Tim Wojtulewicz 2023-05-02 09:42:19 -07:00
commit 71731ffcb1
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.473 | 2023-05-02 09:42:19 -0700
* Fix smith-waterman sorting to follow correct Compare semantics (Tim Wojtulewicz)
6.0.0-dev.470 | 2023-04-28 16:33:46 -0700
* CI: Automatically update opensuse-tumbleweed (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.470
6.0.0-dev.473

5
src/SmithWaterman.cc
View file

@ -172,10 +172,7 @@ bool SubstringCmp::operator()(const Substring* bst1, const Substring* bst2) cons
return false;
}
if ( bst1->GetAlignments()[_index].index <= bst2->GetAlignments()[_index].index )
return true;
return false;
return (bst1->GetAlignments()[_index].index < bst2->GetAlignments()[_index].index);
}
// A node in Smith-Waterman's dynamic programming matrix. Each node

4
testing/btest/Baseline/language.smith-waterman-test/output
View file

@ -29,5 +29,5 @@ tok 0: Accept (27/0, T)
tok 1: e^M^JAccept (22/15, T)
tok 2: Accept (27/29, T)
xxAAxxAAxx - yyyyyAAyyyyy:
tok 0: AA (2/5, T)
tok 1: AA (6/5, T)
tok 0: AA (6/5, T)
tok 1: AA (2/5, T)