From 85c8c3b275c67276c21543b5a233eb4db15785e4 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Tue, 7 Jun 2022 19:26:24 +0800 Subject: [PATCH] KeyHandler // Completely disable UOM since it doesn't work at all. - Assuming that there is no way to make this module work anymore. --- .../ControllerModules/KeyHandler_Core.swift | 62 ++++++++++--------- .../KeyHandler_HandleInput.swift | 2 +- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Source/Modules/ControllerModules/KeyHandler_Core.swift b/Source/Modules/ControllerModules/KeyHandler_Core.swift index 3374829c..447da1a2 100644 --- a/Source/Modules/ControllerModules/KeyHandler_Core.swift +++ b/Source/Modules/ControllerModules/KeyHandler_Core.swift @@ -162,36 +162,38 @@ class KeyHandler { func fixNode(value: String, respectCursorPushing: Bool = true) { let cursorIndex = min(actualCandidateCursorIndex + (mgrPrefs.useRearCursorMode ? 1 : 0), builderLength) - let selectedNode: Megrez.NodeAnchor = _builder.grid.fixNodeSelectedCandidate( - location: cursorIndex, value: value - ) - // 不要針對逐字選字模式啟用臨時半衰記憶模型。 - if !mgrPrefs.useSCPCTypingMode { - // If the length of the readings and the characters do not match, - // it often means it is a special symbol and it should not be stored - // in the user override model. - var addToUserOverrideModel = true - if selectedNode.spanningLength != value.count { - IME.prtDebugIntel("UOM: SpanningLength != value.count, dismissing.") - addToUserOverrideModel = false - } - if addToUserOverrideModel { - if let theNode = selectedNode.node { - // 威注音的 SymbolLM 的 Score 是 -12。 - if theNode.scoreFor(candidate: value) <= -12 { - IME.prtDebugIntel("UOM: Score <= -12, dismissing.") - addToUserOverrideModel = false - } - } - } - if addToUserOverrideModel { - IME.prtDebugIntel("UOM: Start Observation.") - _userOverrideModel.observe( - walkedNodes: _walkedNodes, cursorIndex: cursorIndex, candidate: value, - timestamp: NSDate().timeIntervalSince1970 - ) - } - } + _builder.grid.fixNodeSelectedCandidate(location: cursorIndex, value: value) + // // 因半衰模組失能,故禁用之。 + // let selectedNode: Megrez.NodeAnchor = _builder.grid.fixNodeSelectedCandidate( + // location: cursorIndex, value: value + // ) + // // 不要針對逐字選字模式啟用臨時半衰記憶模型。 + // if !mgrPrefs.useSCPCTypingMode { + // // If the length of the readings and the characters do not match, + // // it often means it is a special symbol and it should not be stored + // // in the user override model. + // var addToUserOverrideModel = true + // if selectedNode.spanningLength != value.count { + // IME.prtDebugIntel("UOM: SpanningLength != value.count, dismissing.") + // addToUserOverrideModel = false + // } + // if addToUserOverrideModel { + // if let theNode = selectedNode.node { + // // 威注音的 SymbolLM 的 Score 是 -12。 + // if theNode.scoreFor(candidate: value) <= -12 { + // IME.prtDebugIntel("UOM: Score <= -12, dismissing.") + // addToUserOverrideModel = false + // } + // } + // } + // if addToUserOverrideModel { + // IME.prtDebugIntel("UOM: Start Observation.") + // _userOverrideModel.observe( + // walkedNodes: _walkedNodes, cursorIndex: cursorIndex, candidate: value, + // timestamp: NSDate().timeIntervalSince1970 + // ) + // } + // } walk() if mgrPrefs.moveCursorAfterSelectingCandidate, respectCursorPushing { diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift index 5e51dad9..a0895d56 100644 --- a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift +++ b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift @@ -188,7 +188,7 @@ extension KeyHandler { let poppedText = popOverflowComposingTextAndWalk // ... get and tweak override model suggestion if possible... - dealWithOverrideModelSuggestions() + // dealWithOverrideModelSuggestions() // 暫時禁用,因為無法使其生效。 // ... then update the text. _composer.clear()