Skip to content

Commit

Permalink
Merge pull request #34 from tryolabs/add_words_and_code_improvements
Browse files Browse the repository at this point in the history
New: `add(words)` API and some code improvements
  • Loading branch information
Bruno Berisso committed May 25, 2017
2 parents d67fcdd + 86af70a commit c05fdef
Show file tree
Hide file tree
Showing 9 changed files with 307 additions and 190 deletions.
3 changes: 3 additions & 0 deletions Sphinx/share/pocketsphinx/model/en-us/basic-lm/6844.dic
@@ -0,0 +1,3 @@
FORWARD F AO R W ER D
GO G OW
TEN T EH N
35 changes: 35 additions & 0 deletions Sphinx/share/pocketsphinx/model/en-us/basic-lm/6844.lm
@@ -0,0 +1,35 @@
Language model created by QuickLM on Mon Jan 23 09:11:27 EST 2017
Copyright (c) 1996-2010 Carnegie Mellon University and Alexander I. Rudnicky

The model is in standard ARPA format, designed by Doug Paul while he was at MITRE.

The code that was used to produce this language model is available in Open Source.
Please visit http://www.speech.cs.cmu.edu/tools/ for more information

The (fixed) discount mass is 0.5. The backoffs are computed using the ratio method.
This model based on a corpus of 1 sentences and 5 words

\data\
ngram 1=5
ngram 2=4
ngram 3=3

\1-grams:
-1.0000 </s> -0.3010
-1.0000 <s> -0.2553
-1.0000 FORWARD -0.2553
-1.0000 GO -0.2553
-1.0000 TEN -0.2553

\2-grams:
-0.3010 <s> GO 0.0000
-0.3010 FORWARD TEN 0.0000
-0.3010 GO FORWARD 0.0000
-0.3010 TEN </s> -0.3010

\3-grams:
-0.3010 <s> GO FORWARD
-0.3010 FORWARD TEN </s>
-0.3010 GO FORWARD TEN

\end\
8 changes: 4 additions & 4 deletions TLSphinx.xcodeproj/project.pbxproj
Expand Up @@ -308,7 +308,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -352,7 +352,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down Expand Up @@ -382,7 +382,7 @@
);
INFOPLIST_FILE = TLSphinx/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(PROJECT_DIR)/Sphinx/lib/pocketsphinx",
Expand Down Expand Up @@ -416,7 +416,7 @@
);
INFOPLIST_FILE = TLSphinx/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(PROJECT_DIR)/Sphinx/lib/pocketsphinx",
Expand Down
6 changes: 3 additions & 3 deletions TLSphinx/Config.swift
Expand Up @@ -9,7 +9,7 @@
import Foundation
import Sphinx.Base

open class Config {
public final class Config {

var cmdLnConf: OpaquePointer?
fileprivate var cArgs: [UnsafeMutablePointer<Int8>?]
Expand All @@ -22,7 +22,7 @@ open class Config {
return [strdup(name),strdup(value)]
}

cmdLnConf = cmd_ln_parse_r(nil, ps_args(), CInt(cArgs.count), &cArgs, STrue)
cmdLnConf = cmd_ln_parse_r(nil, ps_args(), CInt(cArgs.count), &cArgs, STrue32)

if cmdLnConf == nil {
return nil
Expand All @@ -38,7 +38,7 @@ open class Config {
}


open var showDebugInfo: Bool {
public var showDebugInfo: Bool {
get {
if cmdLnConf != nil {
return cmd_ln_str_r(cmdLnConf, "-logfn") == nil
Expand Down

0 comments on commit c05fdef

Please sign in to comment.