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

Refactoring and cleanup

Browse Source
This commit is contained in:
vlofgren 2022-09-03 17:32:53 +02:00
parent 5a4d41d414
commit 2e3d95bcb1
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchOperator.java
View File

@ -175,14 +175,9 @@ public class EdgeSearchOperator {
private DecoratedSearchResultSet performQuery(Context ctx, EdgeSearchQuery processedQuery) {
List<EdgeUrlDetails> resultList = new ArrayList<>(100);
List<EdgeUrlDetails> resultList = new ArrayList<>(processedQuery.specs.limitTotal);
for (var s : processedQuery.specs.subqueries) {
System.out.println(s.block + " : " + s.searchTermsInclude);
}
Set<EdgeUrlDetails> queryResults = wmsa_search_index_api_time.time(() -> fetchResultsSimple(ctx, processedQuery));
for (var details : queryResults) {
for (var details : wmsa_search_index_api_time.time(()->fetchResultsSimple(ctx, processedQuery))) {
if (details.getUrlQuality() <= -100) {
continue;
}
@ -193,7 +188,6 @@ public class EdgeSearchOperator {
resultList.add(details);
}
resultList.sort(resultListComparator);
resultList.removeIf(new UrlDeduplicator(processedQuery.specs.limitByDomain)::shouldRemove);

16
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/results/SearchResultDecorator.java
View File

@ -72,21 +72,13 @@ public class SearchResultDecorator {
}
private double calculateTermScore(IndexBlock block, EdgeSearchResultItem resultItem, EdgeUrlDetails details) {
int titleLength = details.title.length();
double value = valuator.evaluateTerms(resultItem.scores, block, details.words,titleLength) / Math.sqrt(1 + resultItem.queryLength)
+ ((details.domainState == EdgeDomainIndexingState.SPECIAL) ? 1.25 : 0);
final double lengthPenalty = 1.0 / Math.sqrt(resultItem.queryLength);
final double statePenalty = (details.domainState == EdgeDomainIndexingState.SPECIAL) ? 1.25 : 0;
System.out.println("---");
System.out.println(details.getUrl());
System.out.println(details.getTitle());
System.out.println(details.words);
for (var score : resultItem.scores) {
System.out.println(block + ":" + score);
}
System.out.println(value);
final double value = valuator.evaluateTerms(resultItem.scores, block, details.words, details.title.length());
return value;
return value + lengthPenalty + statePenalty;
}
}