floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repo // walkedNodes -> walkedAnchors.

This commit is contained in:
ShikiSuen 2022-06-20 23:21:12 +08:00
parent 067ceebf71
commit 465d0a9845
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Modules/ControllerModules/KeyHandler_Core.swift
View File

@ -196,7 +196,7 @@ class KeyHandler {
// // 令半衰記憶模組觀測給定的 trigram。 // // 令半衰記憶模組觀測給定的 trigram。
// // 這個過程會讓半衰引擎根據當前上下文生成 trigram 索引鍵。 // // 這個過程會讓半衰引擎根據當前上下文生成 trigram 索引鍵。
// currentUOM.observe( // currentUOM.observe(
// walkedNodes: walkedAnchors, cursorIndex: cursorIndex, candidate: value, // walkedAnchors: walkedAnchors, cursorIndex: cursorIndex, candidate: value,
// timestamp: NSDate().timeIntervalSince1970 // timestamp: NSDate().timeIntervalSince1970
// ) // )
// } // }
@ -268,7 +268,7 @@ class KeyHandler {
mgrPrefs.useSCPCTypingMode mgrPrefs.useSCPCTypingMode
? "" ? ""
: currentUOM.suggest( : currentUOM.suggest(
walkedNodes: walkedAnchors, cursorIndex: compositorCursorIndex, walkedAnchors: walkedAnchors, cursorIndex: compositorCursorIndex,
timestamp: NSDate().timeIntervalSince1970 timestamp: NSDate().timeIntervalSince1970
) )

12
Source/Modules/LangModelRelated/SubLMs/lmUserOverride.swift
View File

@ -78,12 +78,12 @@ extension vChewing {
} }
public func observe( public func observe(
walkedNodes: [Megrez.NodeAnchor], walkedAnchors: [Megrez.NodeAnchor],
cursorIndex: Int, cursorIndex: Int,
candidate: String, candidate: String,
timestamp: Double timestamp: Double
) { ) {
let key = convertKeyFrom(walkedNodes: walkedNodes, cursorIndex: cursorIndex) let key = convertKeyFrom(walkedAnchors: walkedAnchors, cursorIndex: cursorIndex)
guard mutLRUMap[key] != nil else { guard mutLRUMap[key] != nil else {
let observation: Observation = .init() let observation: Observation = .init()
@ -108,11 +108,11 @@ extension vChewing {
} }
public func suggest( public func suggest(
walkedNodes: [Megrez.NodeAnchor], walkedAnchors: [Megrez.NodeAnchor],
cursorIndex: Int, cursorIndex: Int,
timestamp: Double timestamp: Double
) -> String { ) -> String {
let key = convertKeyFrom(walkedNodes: walkedNodes, cursorIndex: cursorIndex) let key = convertKeyFrom(walkedAnchors: walkedAnchors, cursorIndex: cursorIndex)
guard let koPair = mutLRUMap[key] else { guard let koPair = mutLRUMap[key] else {
IME.prtDebugIntel("UOM: mutLRUMap[key] is nil, throwing blank suggestion for key: \(key).") IME.prtDebugIntel("UOM: mutLRUMap[key] is nil, throwing blank suggestion for key: \(key).")
return "" return ""
@ -161,12 +161,12 @@ extension vChewing {
} }
func convertKeyFrom( func convertKeyFrom(
walkedNodes: [Megrez.NodeAnchor], cursorIndex: Int walkedAnchors: [Megrez.NodeAnchor], cursorIndex: Int
) -> String { ) -> String {
let arrEndingPunctuation = ["，", "。", "！", "？", "」", "』", "”", "’"] let arrEndingPunctuation = ["，", "。", "！", "？", "」", "』", "”", "’"]
var arrNodes: [Megrez.NodeAnchor] = [] var arrNodes: [Megrez.NodeAnchor] = []
var intLength = 0 var intLength = 0
for theNodeAnchor in walkedNodes { for theNodeAnchor in walkedAnchors {
arrNodes.append(theNodeAnchor) arrNodes.append(theNodeAnchor)
intLength += theNodeAnchor.spanningLength intLength += theNodeAnchor.spanningLength
if intLength >= cursorIndex { if intLength >= cursorIndex {