From 1c87ff6cfd272e782ac79f9ac0ea65265ac974bb Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Mon, 28 Mar 2022 18:59:26 +0800 Subject: [PATCH] mgrLM // Deprecating External LM Converter. --- Source/Modules/AppDelegate.swift | 1 - Source/Modules/IMEModules/mgrPrefs.swift | 16 ------------ .../Modules/LangModelRelated/LMInstantiator.h | 9 ------- .../LangModelRelated/LMInstantiator.mm | 19 -------------- .../Modules/LangModelRelated/mgrLangModel.h | 1 - .../Modules/LangModelRelated/mgrLangModel.mm | 26 ------------------- 6 files changed, 72 deletions(-) diff --git a/Source/Modules/AppDelegate.swift b/Source/Modules/AppDelegate.swift index 47bb231b..a46a9332 100644 --- a/Source/Modules/AppDelegate.swift +++ b/Source/Modules/AppDelegate.swift @@ -176,7 +176,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, ctlNonModalAlertWindowDelega } func applicationDidFinishLaunching(_ notification: Notification) { - mgrLangModel.setupDataModelValueConverter() mgrLangModel.loadDataModels() // 這句還是不要砍了。 mgrLangModel.loadUserPhrases() mgrLangModel.loadUserPhraseReplacement() diff --git a/Source/Modules/IMEModules/mgrPrefs.swift b/Source/Modules/IMEModules/mgrPrefs.swift index 4a5c6be3..334227c7 100644 --- a/Source/Modules/IMEModules/mgrPrefs.swift +++ b/Source/Modules/IMEModules/mgrPrefs.swift @@ -49,7 +49,6 @@ private let kCandidateKeyLabelFontName = "CandidateKeyLabelFontName" private let kCandidateKeys = "CandidateKeys" private let kChineseConversionEngine = "ChineseConversionEngine" -private let kChineseConversionStyle = "ChineseConversionStyle" private let kAssociatedPhrasesEnabled = "AssociatedPhrasesEnabled" private let kPhraseReplacementEnabled = "PhraseReplacementEnabled" @@ -195,20 +194,6 @@ struct ComposingBufferSize { } } -@objc enum ChineseConversionStyle: Int { - case output - case model - - var name: String { - switch (self) { - case .output: - return "output" - case .model: - return "model" - } - } -} - // MARK: - @objc public class mgrPrefs: NSObject { static var allKeys:[String] { @@ -240,7 +225,6 @@ struct ComposingBufferSize { kMaxCandidateLength, kShouldNotFartInLieuOfBeep, kChineseConversionEngine, - kChineseConversionStyle, kAssociatedPhrasesEnabled] } diff --git a/Source/Modules/LangModelRelated/LMInstantiator.h b/Source/Modules/LangModelRelated/LMInstantiator.h index c8b0c504..cefb72fb 100644 --- a/Source/Modules/LangModelRelated/LMInstantiator.h +++ b/Source/Modules/LangModelRelated/LMInstantiator.h @@ -125,13 +125,6 @@ public: /// If CNS11643 input is enabled or not. bool cnsEnabled(); - /// Enables or disables the external converter. - void setExternalConverterEnabled(bool enabled); - /// If the external converted is enabled or not. - bool externalConverterEnabled(); - /// Sets a lambda to let the values of unigrams could be converted by it. - void setExternalConverter(std::function externalConverter); - const std::vector associatedPhrasesForKey(const std::string& key); bool hasAssociatedPhrasesForKey(const std::string& key); @@ -160,8 +153,6 @@ protected: bool m_phraseReplacementEnabled; bool m_cnsEnabled; bool m_symbolEnabled; - bool m_externalConverterEnabled; - std::function m_externalConverter; }; }; diff --git a/Source/Modules/LangModelRelated/LMInstantiator.mm b/Source/Modules/LangModelRelated/LMInstantiator.mm index 870468c8..57f88d7a 100644 --- a/Source/Modules/LangModelRelated/LMInstantiator.mm +++ b/Source/Modules/LangModelRelated/LMInstantiator.mm @@ -246,21 +246,6 @@ bool LMInstantiator::symbolEnabled() return m_symbolEnabled; } -void LMInstantiator::setExternalConverterEnabled(bool enabled) -{ - m_externalConverterEnabled = enabled; -} - -bool LMInstantiator::externalConverterEnabled() -{ - return m_externalConverterEnabled; -} - -void LMInstantiator::setExternalConverter(std::function externalConverter) -{ - m_externalConverter = externalConverter; -} - const std::vector LMInstantiator::filterAndTransformUnigrams(const std::vector unigrams, const std::unordered_set& excludedValues, std::unordered_set& insertedValues) { std::vector results; @@ -280,10 +265,6 @@ const std::vector LMInstantiator::filterAndTransformUnigra value = replacement; } } - if (m_externalConverterEnabled && m_externalConverter) { - std::string replacement = m_externalConverter(value); - value = replacement; - } if (insertedValues.find(value) == insertedValues.end()) { Gramambular::Unigram g; g.keyValue.value = value; diff --git a/Source/Modules/LangModelRelated/mgrLangModel.h b/Source/Modules/LangModelRelated/mgrLangModel.h index ded1aa4e..eba1d6b3 100644 --- a/Source/Modules/LangModelRelated/mgrLangModel.h +++ b/Source/Modules/LangModelRelated/mgrLangModel.h @@ -28,7 +28,6 @@ NS_ASSUME_NONNULL_BEGIN + (void)loadUserPhrases; + (void)loadUserAssociatedPhrases; + (void)loadUserPhraseReplacement; -+ (void)setupDataModelValueConverter; + (BOOL)checkIfUserLanguageModelFilesExist; + (BOOL)checkIfUserDataFolderExists; diff --git a/Source/Modules/LangModelRelated/mgrLangModel.mm b/Source/Modules/LangModelRelated/mgrLangModel.mm index da5eb3bc..e90e1c02 100644 --- a/Source/Modules/LangModelRelated/mgrLangModel.mm +++ b/Source/Modules/LangModelRelated/mgrLangModel.mm @@ -134,32 +134,6 @@ static void LTLoadLanguageModelFile(NSString *filenameWithoutExtension, vChewing gLangModelCHS.loadPhraseReplacementMap([[self phraseReplacementDataPath:imeModeCHS] UTF8String]); } -+ (void)setupDataModelValueConverter -{ - auto converter = [] (string input) { -// if (!mgrPrefs.chineseConversionEnabled) { -// return input; -// } -// -// if (mgrPrefs.chineseConversionStyle == 0) { -// return input; -// } -// -// NSString *text = [NSString stringWithUTF8String:input.c_str()]; -// if (mgrPrefs.chineseConversionEngine == 1) { -// text = [VXHanConvert convertToKangXiFrom:text]; -// } -// else { -// text = [OpenCCBridge convertToKangXi:text]; -// } -// return string(text.UTF8String); - return input; - }; - - gLangModelCHT.setExternalConverter(converter); - gLangModelCHS.setExternalConverter(converter); -} - + (BOOL)checkIfUserDataFolderExists { NSString *folderPath = [self dataFolderPath];