LMs // Disable dispatch queue on subLMs.

Source/Modules/LangModelRelated/SubLMs/lmAssociates.swift

@@ -93,7 +93,7 @@ extension vChewing {
           keyValueMap[currentKV.key, default: []].append(currentKV)
         }
       }
-      // IME.prtDebugIntel("\(self.keyValueMap.count) entries of data loaded from: \(path)")
+      IME.prtDebugIntel("\(self.keyValueMap.count) entries of data loaded from: \(path)")
       theData = ""
       return true
     }

Source/Modules/LangModelRelated/SubLMs/lmCore.swift

@@ -85,53 +85,49 @@ extension vChewing {
       }
 
       let arrData = theData.components(separatedBy: "\n")
-      DispatchQueue.global(qos: .userInitiated).async {
+      for (lineID, lineContent) in arrData.enumerated() {
-        for (lineID, lineContent) in arrData.enumerated() {
+        if !lineContent.hasPrefix("#") {
-          if !lineContent.hasPrefix("#") {
+          let lineContent = lineContent.replacingOccurrences(of: "\t", with: " ")
-            let lineContent = lineContent.replacingOccurrences(of: "\t", with: " ")
+          if lineContent.components(separatedBy: " ").count < 2 {
-            if lineContent.components(separatedBy: " ").count < 2 {
+            if arrData.last != "" {
-              if arrData.last != "" {
+              IME.prtDebugIntel("Line #\(lineID + 1) Wrecked: \(lineContent)")
-                IME.prtDebugIntel("Line #\(lineID + 1) Wrecked: \(lineContent)")
-              }
-              continue
             }
-            var currentUnigram = Megrez.Unigram(keyValue: Megrez.KeyValuePair(), score: self.defaultScore)
+            continue
-            var columnOne = ""
+          }
-            var columnTwo = ""
+          var currentUnigram = Megrez.Unigram(keyValue: Megrez.KeyValuePair(), score: self.defaultScore)
-            DispatchQueue.global(qos: .userInitiated).async {
+          var columnOne = ""
-              for (unitID, unitContent) in lineContent.components(separatedBy: " ").enumerated() {
+          var columnTwo = ""
-                switch unitID {
+          for (unitID, unitContent) in lineContent.components(separatedBy: " ").enumerated() {
-                  case 0:
+            switch unitID {
-                    columnOne = unitContent
+              case 0:
-                  case 1:
+                columnOne = unitContent
-                    columnTwo = unitContent
+              case 1:
-                  case 2:
+                columnTwo = unitContent
-                    if !self.shouldForceDefaultScore {
+              case 2:
-                      if let unitContentConverted = Double(unitContent) {
+                if !self.shouldForceDefaultScore {
-                        currentUnigram.score = unitContentConverted
+                  if let unitContentConverted = Double(unitContent) {
-                      } else {
+                    currentUnigram.score = unitContentConverted
-                        IME.prtDebugIntel("Line #\(lineID) Score Data Wrecked: \(lineContent)")
+                  } else {
-                      }
+                    IME.prtDebugIntel("Line #\(lineID) Score Data Wrecked: \(lineContent)")
-                    }
+                  }
-                  default: break
                 }
-              }
+              default: break
-              // 標點符號的頻率最好鎖定一下。
-              if columnOne.contains("_punctuation_") {
-                currentUnigram.score -= (Double(lineID) * 0.000001)
-              }
-              let kvPair =
-                self.shouldReverse
-                ? Megrez.KeyValuePair(key: columnTwo, value: columnOne)
-                : Megrez.KeyValuePair(key: columnOne, value: columnTwo)
-              currentUnigram.keyValue = kvPair
-              let key = self.shouldReverse ? columnTwo : columnOne
-              self.keyValueScoreMap[key, default: []].append(currentUnigram)
             }
           }
+          // 標點符號的頻率最好鎖定一下。
+          if columnOne.contains("_punctuation_") {
+            currentUnigram.score -= (Double(lineID) * 0.000001)
+          }
+          let kvPair =
+            self.shouldReverse
+            ? Megrez.KeyValuePair(key: columnTwo, value: columnOne)
+            : Megrez.KeyValuePair(key: columnOne, value: columnTwo)
+          currentUnigram.keyValue = kvPair
+          let key = self.shouldReverse ? columnTwo : columnOne
+          self.keyValueScoreMap[key, default: []].append(currentUnigram)
         }
-        // IME.prtDebugIntel("\(self.keyValueScoreMap.count) entries of data loaded from: \(path)")
       }
+      IME.prtDebugIntel("\(self.keyValueScoreMap.count) entries of data loaded from: \(path)")
       theData = ""
       return true
     }

Source/Modules/LangModelRelated/SubLMs/lmLite.swift

@@ -76,34 +76,28 @@ extension vChewing {
       }
 
       let arrData = theData.components(separatedBy: "\n")
-      DispatchQueue.global(qos: .userInitiated).async {
+      for (lineID, lineContent) in arrData.enumerated() {
-        for (lineID, lineContent) in arrData.enumerated() {
+        if !lineContent.hasPrefix("#") {
-          if !lineContent.hasPrefix("#") {
+          if lineContent.components(separatedBy: " ").count < 2 {
-            if lineContent.components(separatedBy: " ").count < 2 {
+            if arrData.last != "" {
-              if arrData.last != "" {
+              IME.prtDebugIntel("Line #\(lineID + 1) Wrecked: \(lineContent)")
-                IME.prtDebugIntel("Line #\(lineID + 1) Wrecked: \(lineContent)")
-              }
-              continue
             }
-            var currentKV = Megrez.KeyValuePair()
+            continue
-            DispatchQueue.global(qos: .userInitiated).async {
+          }
-              for (unitID, unitContent) in lineContent.components(separatedBy: " ").enumerated() {
+          var currentKV = Megrez.KeyValuePair()
-                switch unitID {
+          for (unitID, unitContent) in lineContent.components(separatedBy: " ").enumerated() {
-                  case 0:
+            switch unitID {
-                    currentKV.value = unitContent
+              case 0:
-                  case 1:
+                currentKV.value = unitContent
-                    currentKV.key = unitContent
+              case 1:
-                  default: break
+                currentKV.key = unitContent
-                }
+              default: break
-              }
-              DispatchQueue.main.async {
-                self.keyValueMap[currentKV.key, default: []].append(currentKV)
-              }
             }
           }
+          keyValueMap[currentKV.key, default: []].append(currentKV)
         }
-        // IME.prtDebugIntel("\(self.keyValueMap.count) entries of data loaded from: \(path)")
       }
+      IME.prtDebugIntel("\(self.keyValueMap.count) entries of data loaded from: \(path)")
       theData = ""
       if path.contains("vChewing/") {
         dump()

Source/Modules/LangModelRelated/SubLMs/lmLiteMono.swift

@@ -1,140 +0,0 @@
-// Copyright (c) 2021 and onwards The vChewing Project (MIT-NTL License).
-// Refactored from the ObjCpp-version of this class by:
-// (c) 2011 and onwards The OpenVanilla Project (MIT License).
-/*
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-1. The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-2. No trademark license is granted to use the trade names, trademarks, service
-marks, or product names of Contributor, except as required to fulfill notice
-requirements above.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-import Foundation
-
-extension vChewing {
-  public class LMLiteMono {
-    var keyValueMap: [String: [Megrez.KeyValuePair]] = [:]
-    var theData: String = ""
-    var allowConsolidation = false
-
-    public init(consolidate: Bool = false) {
-      keyValueMap = [:]
-      theData = ""
-      allowConsolidation = consolidate
-    }
-
-    deinit {
-      if isLoaded() {
-        close()
-      }
-    }
-
-    public func isLoaded() -> Bool {
-      !keyValueMap.isEmpty
-    }
-
-    @discardableResult public func open(_ path: String) -> Bool {
-      if isLoaded() {
-        return false
-      }
-
-      if allowConsolidation {
-        if !LMConsolidator.fixEOF(path: path) {
-          return false
-        }
-        if !LMConsolidator.consolidate(path: path, pragma: true) {
-          return false
-        }
-      }
-
-      do {
-        theData = try String(contentsOfFile: path, encoding: .utf8)
-      } catch {
-        IME.prtDebugIntel("\(error)")
-        IME.prtDebugIntel("↑ Exception happened when reading Associated Phrases data.")
-        return false
-      }
-
-      let length = theData.count
-      guard length > 0 else {
-        return false
-      }
-
-      let arrData = theData.components(separatedBy: "\n")
-      for (lineID, lineContent) in arrData.enumerated() {
-        if !lineContent.hasPrefix("#") {
-          if lineContent.components(separatedBy: " ").count < 2 {
-            if arrData.last != "" {
-              IME.prtDebugIntel("Line #\(lineID + 1) Wrecked: \(lineContent)")
-            }
-            continue
-          }
-          var currentKV = Megrez.KeyValuePair()
-          for (unitID, unitContent) in lineContent.components(separatedBy: " ").enumerated() {
-            switch unitID {
-              case 0:
-                currentKV.value = unitContent
-              case 1:
-                currentKV.key = unitContent
-              default: break
-            }
-          }
-          keyValueMap[currentKV.key, default: []].append(currentKV)
-        }
-      }
-      // IME.prtDebugIntel("\(self.keyValueMap.count) entries of data loaded from: \(path)")
-      theData = ""
-      if path.contains("vChewing/") {
-        dump()
-      }
-      return true
-    }
-
-    public func close() {
-      if isLoaded() {
-        keyValueMap.removeAll()
-      }
-    }
-
-    public func dump() {
-      var strDump = ""
-      for entry in keyValueMap {
-        let rows: [Megrez.KeyValuePair] = entry.1
-        for row in rows {
-          let addline = row.key + " " + row.value + "\n"
-          strDump += addline
-        }
-      }
-      IME.prtDebugIntel(strDump)
-    }
-
-    public func unigramsFor(key: String, score givenScore: Double = 0.0) -> [Megrez.Unigram] {
-      var v: [Megrez.Unigram] = []
-      if let matched = keyValueMap[key] {
-        for entry in matched as [Megrez.KeyValuePair] {
-          v.append(Megrez.Unigram(keyValue: entry, score: givenScore))
-        }
-      }
-      return v
-    }
-
-    public func hasUnigramsFor(key: String) -> Bool {
-      keyValueMap[key] != nil
-    }
-  }
-}

Source/Modules/LangModelRelated/SubLMs/lmReplacements.swift

@@ -93,7 +93,8 @@ extension vChewing {
           keyValueMap[currentKV.key] = currentKV.value
         }
       }
-      // IME.prtDebugIntel("\(self.keyValueMap.count) entries of data loaded from: \(path)")			theData = ""
+      IME.prtDebugIntel("\(self.keyValueMap.count) entries of data loaded from: \(path)")
+      theData = ""
       return true
     }
 

vChewing.xcodeproj/project.pbxproj

@@ -29,7 +29,6 @@
 		5B407153281F94E6009C24CB /* Composer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B407152281F94E6009C24CB /* Composer.mm */; };
 		5B40730C281672610023DFFF /* lmAssociates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B407309281672610023DFFF /* lmAssociates.swift */; };
 		5B40730D281672610023DFFF /* lmReplacements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B40730A281672610023DFFF /* lmReplacements.swift */; };
-		5B5D28AC281EA1E900523D4D /* lmLiteMono.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B5D28AB281EA1E800523D4D /* lmLiteMono.swift */; };
 		5B5E535227EF261400C6AA1E /* IME.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B5E535127EF261400C6AA1E /* IME.swift */; };
 		5B61B0CA280BEFD4002E3CFA /* KeyHandler_Misc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B61B0C9280BEFD4002E3CFA /* KeyHandler_Misc.swift */; };
 		5B62A32927AE77D100A19448 /* FSEventStreamHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B62A32827AE77D100A19448 /* FSEventStreamHelper.swift */; };
@@ -207,7 +206,6 @@
 		5B407152281F94E6009C24CB /* Composer.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Composer.mm; sourceTree = "<group>"; };
 		5B407309281672610023DFFF /* lmAssociates.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; lineEnding = 0; path = lmAssociates.swift; sourceTree = "<group>"; usesTabs = 0; };
 		5B40730A281672610023DFFF /* lmReplacements.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; lineEnding = 0; path = lmReplacements.swift; sourceTree = "<group>"; usesTabs = 0; };
-		5B5D28AB281EA1E800523D4D /* lmLiteMono.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = lmLiteMono.swift; sourceTree = "<group>"; usesTabs = 0; };
 		5B5E535127EF261400C6AA1E /* IME.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = IME.swift; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
 		5B61B0C9280BEFD4002E3CFA /* KeyHandler_Misc.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = KeyHandler_Misc.swift; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
 		5B62A32827AE77D100A19448 /* FSEventStreamHelper.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = FSEventStreamHelper.swift; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
@@ -398,7 +396,6 @@
 			children = (
 				5B407309281672610023DFFF /* lmAssociates.swift */,
 				5BA0DF2F2817857D009E73BB /* lmCore.swift */,
-				5B5D28AB281EA1E800523D4D /* lmLiteMono.swift */,
 				5B00A22F282011980058E5DB /* lmLite.swift */,
 				5B40730A281672610023DFFF /* lmReplacements.swift */,
 				5BA0DF2E2817857D009E73BB /* lmUserOverride.swift */,
@@ -1082,7 +1079,6 @@
 				5B40730C281672610023DFFF /* lmAssociates.swift in Sources */,
 				5B707CE827D9F4590099EF99 /* OpenCCBridge.swift in Sources */,
 				D427F76C278CA2B0004A2160 /* AppDelegate.swift in Sources */,
-				5B5D28AC281EA1E900523D4D /* lmLiteMono.swift in Sources */,
 				5BA9FD4527FEF3C9002DE248 /* ToolbarItemStyleViewController.swift in Sources */,
 				5BA0DF322817857D009E73BB /* lmCore.swift in Sources */,
 				5BA9FD4127FEF3C8002DE248 /* PreferencesStyle.swift in Sources */,