[Julius-cvs 581] CVS update: julius4/libjulius/include/julius

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2011年 2月 5日 (土) 18:00:41 JST


Index: julius4/libjulius/include/julius/extern.h
diff -u julius4/libjulius/include/julius/extern.h:1.16 julius4/libjulius/include/julius/extern.h:1.17
--- julius4/libjulius/include/julius/extern.h:1.16	Fri Sep 18 17:31:08 2009
+++ julius4/libjulius/include/julius/extern.h	Sat Feb  5 18:00:41 2011
@@ -12,7 +12,7 @@
  * @author Akinobu LEE
  * @date   Mon Mar  7 23:19:14 2005
  *
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
  * 
  */
 /*
@@ -171,6 +171,7 @@
 void opt_release(Jconf *jconf);
 /* m_jconf.c */
 void get_dirname(char *path);
+boolean config_string_parse(char *str, Jconf *jconf);
 boolean config_file_parse(char *conffile, Jconf *jconf);
 /* m_chkparam.c */
 boolean checkpath(char *filename);
Index: julius4/libjulius/include/julius/jconf.h
diff -u julius4/libjulius/include/julius/jconf.h:1.8 julius4/libjulius/include/julius/jconf.h:1.9
--- julius4/libjulius/include/julius/jconf.h:1.8	Tue Feb 10 17:15:48 2009
+++ julius4/libjulius/include/julius/jconf.h	Sat Feb  5 18:00:41 2011
@@ -23,7 +23,7 @@
  * @author Akinobu Lee
  * @date   Fri Feb 16 13:42:28 2007
  *
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  * 
  */
 /*
@@ -220,6 +220,22 @@
 } JCONF_AM;
 
 /**
+ * Name lister for language model configurations
+ * 
+ */
+typedef struct __jconf_lm_namelist__ {
+  /**
+   * Entry name
+   */
+  char *name;
+  /**
+   * Pointer to next object
+   */
+  struct __jconf_lm_namelist__ *next;
+
+} JCONF_LM_NAMELIST;
+
+/**
  * Language models (N-gram / DFA), dictionary, and related parameters.
  * 
  */
@@ -340,6 +356,16 @@
   char unknown_name[UNK_WORD_MAXLEN];
 
   /**
+   * List of additional dictionary files
+   */
+  JCONF_LM_NAMELIST *additional_dict_files;
+
+  /**
+   * List of additional dictionary entries
+   */
+  JCONF_LM_NAMELIST *additional_dict_entries;
+
+  /**
    * Pointer to next instance
    * 
    */
Index: julius4/libjulius/include/julius/jfunc.h
diff -u julius4/libjulius/include/julius/jfunc.h:1.7 julius4/libjulius/include/julius/jfunc.h:1.8
--- julius4/libjulius/include/julius/jfunc.h:1.7	Fri Sep 18 17:31:08 2009
+++ julius4/libjulius/include/julius/jfunc.h	Sat Feb  5 18:00:41 2011
@@ -12,7 +12,7 @@
  * @author Akinobu Lee
  * @date   Tue Nov  6 22:41:00 2007
  * 
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  * 
  */
 /*
@@ -52,9 +52,13 @@
 void j_internal_error(char *fmt, ...);
 
 int j_config_load_args(Jconf *jconf, int argc, char *argv[]);
+int j_config_load_string(Jconf *jconf, char *string);
 int j_config_load_file(Jconf *jconf, char *filename);
 Jconf *j_config_load_args_new(int argc, char *argv[]);
+Jconf *j_config_load_string_new(char *string);
 Jconf *j_config_load_file_new(char *filename);
+void j_add_dict(JCONF_LM *lm, char *dictfile);
+void j_add_word(JCONF_LM *lm, char *wordentry);
 boolean j_adin_init(Recog *recog);
 char *j_get_current_filename(Recog *recog);
 void j_recog_info(Recog *recog);
Index: julius4/libjulius/include/julius/recog.h
diff -u julius4/libjulius/include/julius/recog.h:1.11 julius4/libjulius/include/julius/recog.h:1.12
--- julius4/libjulius/include/julius/recog.h:1.11	Sun Jul  5 23:12:18 2009
+++ julius4/libjulius/include/julius/recog.h	Sat Feb  5 18:00:41 2011
@@ -70,7 +70,7 @@
  * @author Akinobu Lee
  * @date   Fri Feb 16 13:42:28 2007
  *
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  * 
  */
 /*
@@ -224,6 +224,7 @@
   LOGPROB *sentcm = NULL;       ///< Confidence score of each sentence
   LOGPROB *wordcm = NULL;       ///< Confidence score of each word voted from @a sentcm
   int sentnum;          ///< Allocated length of @a sentcm
+  int wordnum;          ///< Allocated length of @a wordcm
 # endif
 #endif /* CONFIDENCE_MEASURE */
 



Julius-cvs メーリングリストの案内
アーカイブの一覧に戻る