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

(ranking) Cleanup

Browse Source
This commit is contained in:
Viktor Lofgren 2024-04-19 14:13:12 +02:00
parent f623b37577
commit 4489b21528
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultSet.java
View File

@ -19,14 +19,4 @@ public class SearchResultSet {
return results.size();
}
public static SearchResultSet combine(SearchResultSet l, SearchResultSet r) {
List<DecoratedSearchResultItem> combinedItems = new ArrayList<>(l.size() + r.size());
combinedItems.addAll(l.results);
combinedItems.addAll(r.results);
// TODO: Do we combine these correctly?
combinedItems.sort(Comparator.comparing(item -> item.rankingScore));
return new SearchResultSet(combinedItems);
}
}

7
code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryGRPCService.java
View File

@ -53,7 +53,7 @@ public class QueryGRPCService extends QueryApiGrpc.QueryApiImplBase {
Integer.toString(request.getQueryLimits().getResultsTotal()))
.time(() -> {
var params = QueryProtobufCodec.convertRequest(request);
var query = queryFactory.createQuery(params, null);
var query = queryFactory.createQuery(params, ResultRankingParameters.sensibleDefaults());
RpcIndexQuery indexRequest = QueryProtobufCodec.convertQuery(request, query);
List<RpcDecoratedResultItem> bestItems = executeQueries(indexRequest, request.getQueryLimits().getResultsTotal());
@ -109,7 +109,10 @@ public class QueryGRPCService extends QueryApiGrpc.QueryApiImplBase {
results.sort(comparator);
results.removeIf(this::isBlacklisted);
return results.subList(0, Math.min(totalSize, results.size()));
if (results.size() > totalSize) {
results = results.subList(0, totalSize);
}
return results;
}
}

4
code/index/java/nu/marginalia/ranking/results/ResultValuator.java
View File

@ -137,7 +137,9 @@ public class ResultValuator {
return Double.MAX_VALUE;
}
return ret;
else {
return ret;
}
}
private double calculateQualityPenalty(int size, int quality, ResultRankingParameters rankingParams) {