From 56c5c4a737c56de8e8e4ac0a09f8c2af4f6d0a39 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 18 Oct 2010 16:46:38 +0800 Subject: re-factor lookup sub-directory --- src/lookup/Makefile.am | 3 ++- src/lookup/lookup.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/lookup/phrase_lookup.h | 12 ++++++++++++ src/lookup/pinyin_lookup.h | 21 ++------------------- 4 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 src/lookup/lookup.h (limited to 'src/lookup') diff --git a/src/lookup/Makefile.am b/src/lookup/Makefile.am index 724c450..9e63c72 100644 --- a/src/lookup/Makefile.am +++ b/src/lookup/Makefile.am @@ -21,7 +21,8 @@ INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CPPFLAGS@ -noinst_HEADERS = pinyin_lookup.h winner_tree.h +noinst_HEADERS = lookup.h pinyin_lookup.h \ + phrase_lookup.h winner_tree.h noinst_PROGRAMS = diff --git a/src/lookup/lookup.h b/src/lookup/lookup.h new file mode 100644 index 0000000..b85101c --- /dev/null +++ b/src/lookup/lookup.h @@ -0,0 +1,46 @@ +/* + * libpinyin + * Library to deal with pinyin. + * + * Copyright (C) 2006-2007 Peng Wu + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef LOOKUP_H +#define LOOKUP_H + +/** @file lookup.h + * @brief the definitions of common lookup related classes and structs. + */ + +typedef phrase_token_t lookup_key_t; + +struct lookup_value_t{ + /* previous and current tokens of the node */ + phrase_token_t m_handles[2]; + /* maximum possibility of current node */ + gfloat m_poss; + /* trace back information for final step */ + gint32 m_last_step; + + lookup_value_t(gfloat poss = FLT_MAX){ + m_handles[0] = null_token; m_handles[1] = null_token; + m_poss = poss; + m_last_step = -1; + } +}; + +#endif diff --git a/src/lookup/phrase_lookup.h b/src/lookup/phrase_lookup.h index e559772..3565031 100644 --- a/src/lookup/phrase_lookup.h +++ b/src/lookup/phrase_lookup.h @@ -19,3 +19,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef PHRASE_LOOKUP_H +#define PHRASE_LOOKUP_H + +#include "novel_types.h" +#include "lookup.h" + +/** @file phrase_lookup.h + * @brief the definitions of phrase lookup related classes and structs. + */ + + +#endif diff --git a/src/lookup/pinyin_lookup.h b/src/lookup/pinyin_lookup.h index e8aecd9..244d15f 100644 --- a/src/lookup/pinyin_lookup.h +++ b/src/lookup/pinyin_lookup.h @@ -26,31 +26,14 @@ #include #include "novel_types.h" #include "pinyin_base.h" +#include "lookup.h" class WinnerTree; /** @file pinyin_lookup.h - * @brief the definitions of lookup related classes and structs. - * Currently only contains pinyin lookup. + * @brief the definitions of pinyin lookup related classes and structs. */ -typedef phrase_token_t lookup_key_t; - -struct lookup_value_t{ - /* previous and current tokens of the node */ - phrase_token_t m_handles[2]; - /* maximum possibility of current node */ - gfloat m_poss; - /* trace back information for final step */ - gint32 m_last_step; - - lookup_value_t(gfloat poss = FLT_MAX){ - m_handles[0] = null_token; m_handles[1] = null_token; - m_poss = poss; - m_last_step = -1; - } -}; - enum constraint_type{NO_CONSTRAINT, CONSTRAINT_ONESTEP, CONSTRAINT_NOSEARCH }; struct lookup_constraint_t{ -- cgit