[Julius-cvs 610] CVS update: julius4/libsent/include/sent

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2011年 2月 13日 (日) 19:45:56 JST


Index: julius4/libsent/include/sent/ngram2.h
diff -u julius4/libsent/include/sent/ngram2.h:1.8 julius4/libsent/include/sent/ngram2.h:1.9
--- julius4/libsent/include/sent/ngram2.h:1.8	Fri Sep 18 17:31:08 2009
+++ julius4/libsent/include/sent/ngram2.h	Sun Feb 13 19:45:56 2011
@@ -95,7 +95,7 @@
  * @author Akinobu LEE
  * @date   Fri Feb 11 15:04:02 2005
  *
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  * 
  */
 /*
@@ -182,6 +182,9 @@
   LOGPROB *bo_wt_1;		///< back-off weights for 2-gram on 1st pass
   LOGPROB *p_2;			///< 2-gram prob for the 1st pass
   LOGPROB (*bigram_prob)(struct __ngram_info__ *, WORD_ID, WORD_ID); ///< Pointer of a function to compite bigram probability on the 1st pass.  See bi_prob_func_set() for details
+
+  BMALLOC_BASE *mroot;		///< Pointer for block memory allocation for lookup index
+
 } NGRAM_INFO;
 
 
Index: julius4/libsent/include/sent/ptree.h
diff -u julius4/libsent/include/sent/ptree.h:1.5 julius4/libsent/include/sent/ptree.h:1.6
--- julius4/libsent/include/sent/ptree.h:1.5	Fri Sep 18 17:31:08 2009
+++ julius4/libsent/include/sent/ptree.h	Sun Feb 13 19:45:56 2011
@@ -17,7 +17,7 @@
  * @author Akinobu LEE
  * @date   Fri Feb 11 17:27:24 2005
  *
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  * 
  */
 /*
@@ -72,13 +72,12 @@
 int testbit(char *str, int slen, int bitplace);
 int testbit_max(char *str, int bitplace, int maxbitplace);
 int where_the_bit_differ(char *str1, char *str2);
-PATNODE *make_ptree(char **words, int *data, int wordsnum, int bitplace);
+PATNODE *make_ptree(char **words, int *data, int wordsnum, int bitplace, BMALLOC_BASE **mroot);
 void disp_ptree(PATNODE *node, int level);
 int ptree_search_data(char *str, PATNODE *rootnode);
 int ptree_replace_data(char *str, int val, PATNODE *node);
-PATNODE *ptree_make_root_node(int data);
-void ptree_add_entry(char *str, int data, char *matchstr, PATNODE **rootnode);
-void free_ptree(PATNODE *rootnode);
+PATNODE *ptree_make_root_node(int data, BMALLOC_BASE **mroot);
+void ptree_add_entry(char *str, int data, char *matchstr, PATNODE **rootnode, BMALLOC_BASE **mroot);
 
 void *aptree_search_data(char *str, APATNODE *rootnode);
 APATNODE *aptree_make_root_node(void *data, BMALLOC_BASE **mroot);



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