feat: promote uppercased characters and refine document

This commit is contained in:
ensan
2023-09-15 13:19:04 +09:00
parent e64e5f6ddc
commit 4e6fbe17e3
2 changed files with 12 additions and 11 deletions

View File

@@ -1,6 +1,6 @@
//
// Converter.swift
// Kana2KajiProject
// KanaKanjiConverter.swift
// AzooKeyKanaKanjiConverter
//
// Created by ensan on 2020/09/03.
// Copyright © 2020 ensan. All rights reserved.
@@ -430,9 +430,6 @@ import SwiftUtils
// 5
let clause_candidates = self.getUniqueCandidate(clauseCandidates, seenCandidates: seenCandidate).min(count: 5, sortedBy: {$0.value > $1.value})
seenCandidate.formUnion(clause_candidates.map {$0.text})
//
let wise_candidates: [Candidate] = self.getWiseCandidate(inputData, options: options)
seenCandidate.formUnion(wise_candidates.map {$0.text})
//
let dicCandidates: [Candidate] = result.nodes[0]
@@ -449,12 +446,18 @@ import SwiftUtils
let additionalCandidates: [Candidate] = self.getAdditionalCandidate(inputData, options: options)
//
let word_candidates: [Candidate] = self.getUniqueCandidate(dicCandidates.chained(additionalCandidates), seenCandidates: seenCandidate)
var word_candidates: [Candidate] = self.getUniqueCandidate(dicCandidates.chained(additionalCandidates), seenCandidates: seenCandidate)
.sorted {
let count0 = $0.correspondingCount
let count1 = $1.correspondingCount
return count0 == count1 ? $0.value > $1.value : count0 > count1
}
seenCandidate.formUnion(word_candidates.map {$0.text})
//
let wise_candidates: [Candidate] = self.getUniqueCandidate(self.getWiseCandidate(inputData, options: options), seenCandidates: seenCandidate)
// wise_candidates
word_candidates.insert(contentsOf: wise_candidates, at: min(5, word_candidates.endIndex))
var result = Array(full_candidate)
@@ -473,7 +476,6 @@ import SwiftUtils
}
result.append(contentsOf: clause_candidates)
result.append(contentsOf: wise_candidates)
result.append(contentsOf: word_candidates)
result.mutatingForeach { item in