Rebrand names of Language Models

Revert "Rebrand names of Language Models"

This reverts commit 1a2436ae5a6b669840686e84871328d3ef39da4d.

Rebrand names of Language Models
This commit is contained in:
ShikiSuen 2022-01-10 19:06:30 +08:00
parent 93ccff429f
commit 950c013e85
1 changed files with 61 additions and 61 deletions

View File

@ -117,13 +117,13 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot";
#endif #endif
// shared language model object that stores our phrase-term probability database // shared language model object that stores our phrase-term probability database
FastLM gLanguageModel; FastLM gLanguageModelCHT;
FastLM gLanguageModelSimpBopomofo; FastLM gLanguageModelCHS;
static const int kUserOverrideModelCapacity = 500; static const int kUserOverrideModelCapacity = 500;
static const double kObservedOverrideHalflife = 5400.0; // 1.5 hr. static const double kObservedOverrideHalflife = 5400.0; // 1.5 hr.
vChewing::UserOverrideModel gUserOverrideModel(kUserOverrideModelCapacity, kObservedOverrideHalflife); vChewing::UserOverrideModel gUserOverrideModelCHT(kUserOverrideModelCapacity, kObservedOverrideHalflife);
vChewing::UserOverrideModel gUserOverrideModelSimpBopomofo(kUserOverrideModelCapacity, kObservedOverrideHalflife); vChewing::UserOverrideModel gUserOverrideModelCHS(kUserOverrideModelCapacity, kObservedOverrideHalflife);
// https://clang-analyzer.llvm.org/faq.html // https://clang-analyzer.llvm.org/faq.html
__attribute__((annotate("returns_localized_nsstring"))) __attribute__((annotate("returns_localized_nsstring")))
@ -199,9 +199,9 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
_bpmfReadingBuffer = new BopomofoReadingBuffer(BopomofoKeyboardLayout::StandardLayout()); _bpmfReadingBuffer = new BopomofoReadingBuffer(BopomofoKeyboardLayout::StandardLayout());
// create the lattice builder // create the lattice builder
_languageModel = &gLanguageModel; _languageModel = &gLanguageModelCHT;
_builder = new BlockReadingBuilder(_languageModel); _builder = new BlockReadingBuilder(_languageModel);
_uom = &gUserOverrideModel; _uom = &gUserOverrideModelCHT;
// each Mandarin syllable is separated by a hyphen // each Mandarin syllable is separated by a hyphen
_builder->setJoinSeparator("-"); _builder->setJoinSeparator("-");
@ -337,13 +337,13 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
if ([value isKindOfClass:[NSString class]] && [value isEqual:kSimpBopomofoModeIdentifier]) { if ([value isKindOfClass:[NSString class]] && [value isEqual:kSimpBopomofoModeIdentifier]) {
newInputMode = kSimpBopomofoModeIdentifier; newInputMode = kSimpBopomofoModeIdentifier;
newLanguageModel = &gLanguageModelSimpBopomofo; newLanguageModel = &gLanguageModelCHS;
newUom = &gUserOverrideModelSimpBopomofo; newUom = &gUserOverrideModelCHS;
} }
else { else {
newInputMode = kBopomofoModeIdentifier; newInputMode = kBopomofoModeIdentifier;
newLanguageModel = &gLanguageModel; newLanguageModel = &gLanguageModelCHT;
newUom = &gUserOverrideModel; newUom = &gUserOverrideModelCHT;
} }
// Only apply the changes if the value is changed // Only apply the changes if the value is changed
@ -1407,6 +1407,6 @@ static void LTLoadLanguageModelFile(NSString *filenameWithoutExtension, FastLM &
void LTLoadLanguageModel() void LTLoadLanguageModel()
{ {
LTLoadLanguageModelFile(@"data", gLanguageModel); LTLoadLanguageModelFile(@"data", gLanguageModelCHT);
LTLoadLanguageModelFile(@"data-chs", gLanguageModelSimpBopomofo); LTLoadLanguageModelFile(@"data-chs", gLanguageModelCHS);
} }