Merge pull request #119 from ensan-hcl/fix/firstClauseResults

fix: firstClauseResultsとして得られる結果が長さではなくvalueでソートされる挙動を変更
This commit is contained in:
Miwa
2024-08-10 23:48:25 +09:00
committed by GitHub

View File

@ -512,7 +512,13 @@ import SwiftUtils
//
var seenCandidate: Set<String> = full_candidate.mapSet {$0.text}
// 5
let clause_candidates = self.getUniqueCandidate(clauseCandidates, seenCandidates: seenCandidate).min(count: 5, sortedBy: {$0.value > $1.value})
let clause_candidates = self.getUniqueCandidate(clauseCandidates, seenCandidates: seenCandidate).min(count: 5) {
if $0.correspondingCount == $1.correspondingCount {
$0.value > $1.value
} else {
$0.correspondingCount > $1.correspondingCount
}
}
seenCandidate.formUnion(clause_candidates.map {$0.text})
//
@ -566,7 +572,15 @@ import SwiftUtils
item.withActions(self.getAppropriateActions(item))
item.parseTemplate()
}
return ConversionResult(mainResults: result, firstClauseResults: Array(clause_candidates))
// 5
let firstClauseResults = self.getUniqueCandidate(clauseCandidates).min(count: 5) {
if $0.correspondingCount == $1.correspondingCount {
$0.value > $1.value
} else {
$0.correspondingCount > $1.correspondingCount
}
}
return ConversionResult(mainResults: result, firstClauseResults: firstClauseResults)
}
///