Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(index) Coherences need to be able to deal with null values among positions

Browse Source
This commit is contained in:
Viktor Lofgren 2024-07-31 21:50:02 +02:00
parent 285e657f68
commit 15745b692e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/index/java/nu/marginalia/index/results/model/TermCoherenceGroupList.java
View File

@ -30,6 +30,7 @@ public class TermCoherenceGroupList {
} }
public boolean testMandatory(CodedSequence[] positions) { public boolean testMandatory(CodedSequence[] positions) {
for (var coherenceSet : mandatoryGroups) { for (var coherenceSet : mandatoryGroups) {
if (!coherenceSet.test(positions)) { if (!coherenceSet.test(positions)) {
return false; return false;
@ -40,6 +41,7 @@ public class TermCoherenceGroupList {
} }
public int testOptional(CodedSequence[] positions) { public int testOptional(CodedSequence[] positions) {
int best = 0; int best = 0;
for (var coherenceSet : optionalGroups) { for (var coherenceSet : optionalGroups) {
if (coherenceSet.test(positions)) { if (coherenceSet.test(positions)) {
@ -50,6 +52,7 @@ public class TermCoherenceGroupList {
} }
public int countOptional(CodedSequence[] positions) { public int countOptional(CodedSequence[] positions) {
int ct = 0; int ct = 0;
for (var coherenceSet : optionalGroups) { for (var coherenceSet : optionalGroups) {
if (coherenceSet.test(positions)) { if (coherenceSet.test(positions)) {
@ -60,6 +63,7 @@ public class TermCoherenceGroupList {
} }
public int testOptional(CodedSequence[] positions, DocumentSpan span) { public int testOptional(CodedSequence[] positions, DocumentSpan span) {
int best = 0; int best = 0;
for (var coherenceSet : optionalGroups) { for (var coherenceSet : optionalGroups) {
if (coherenceSet.test(span, positions)) { if (coherenceSet.test(span, positions)) {
@ -107,7 +111,11 @@ public class TermCoherenceGroupList {
// so that when we intersect them, an overlap means that the terms are // so that when we intersect them, an overlap means that the terms are
// in the correct order. Note the offset is negative! // in the correct order. Note the offset is negative!
sequences[si++] = positions[offset].offsetIterator(-oi); var posForTerm = positions[offset];
if (posForTerm == null) {
return false;
}
sequences[si++] = posForTerm.offsetIterator(-oi);
} }
return SequenceOperations.intersectSequences(sequences); return SequenceOperations.intersectSequences(sequences);
@ -130,7 +138,11 @@ public class TermCoherenceGroupList {
// so that when we intersect them, an overlap means that the terms are // so that when we intersect them, an overlap means that the terms are
// in the correct order. Note the offset is negative! // in the correct order. Note the offset is negative!
sequences[si++] = positions[offset].offsetIterator(-oi); var posForTerm = positions[offset];
if (posForTerm == null) {
return false;
}
sequences[si++] = posForTerm.offsetIterator(-oi);
} }
var intersections = SequenceOperations.findIntersections(sequences); var intersections = SequenceOperations.findIntersections(sequences);