Commit 5caac870 authored by 段英荣's avatar 段英荣

modify bug

parent bf58676d
...@@ -40,16 +40,15 @@ def get_tips_suggest_list(instance_cn_name): ...@@ -40,16 +40,15 @@ def get_tips_suggest_list(instance_cn_name):
cur_index = 0 cur_index = 0
# 中文 # 中文
for i in range(len(ch_full_word)): for i in range(len(ch_full_word)):
#for j in range(i, len(ch_full_word) + 1):
ch_name_term = ch_full_word[i:].strip() ch_name_term = ch_full_word[i:].strip()
if ch_name_term: if ch_name_term and ch_full_word[i]!="(" and ch_full_word[i]!=")":
prefix_weight = ch_prefix_weight if len(ch_name_term) != len(ch_full_word) else ch_full_weight prefix_weight = ch_prefix_weight if len(ch_name_term) != len(ch_full_word) else ch_full_weight
suggest_type = 0 if len(ch_name_term) != len(ch_full_word) else 1 suggest_type = 0 if len(ch_name_term) != len(ch_full_word) else 1
#term_begin_prefix_weight = begin_prefix_weight if i == 0 else 1.0 term_begin_prefix_weight = begin_prefix_weight if i == 0 else 1.0
suggest_item = { suggest_item = {
"input": [ch_name_term], "input": [ch_name_term],
"word_weight": (1.0 * len(ch_name_term) / len((ch_full_word))) * prefix_weight, "word_weight": (1.0 * len(ch_name_term) / len((ch_full_word))) * prefix_weight * term_begin_prefix_weight,
"suggest_type": suggest_type, "suggest_type": suggest_type
} }
if ch_name_term[0] not in suggest_dict: if ch_name_term[0] not in suggest_dict:
cur_index += 1 cur_index += 1
...@@ -60,22 +59,21 @@ def get_tips_suggest_list(instance_cn_name): ...@@ -60,22 +59,21 @@ def get_tips_suggest_list(instance_cn_name):
if suggest_item["word_weight"] > suggest_dict[ch_name_term[0]]["word_weight"]: if suggest_item["word_weight"] > suggest_dict[ch_name_term[0]]["word_weight"]:
suggest_dict[ch_name_term[0]]["word_weight"] = suggest_item["word_weight"] suggest_dict[ch_name_term[0]]["word_weight"] = suggest_item["word_weight"]
suggest_dict[ch_name_term[0]]["suggest_type"] = suggest_item["suggest_type"] suggest_dict[ch_name_term[0]]["suggest_type"] = suggest_item["suggest_type"]
# 拼音 # 拼音
if py_full_word != ch_full_word: if py_full_word != ch_full_word:
for i in range(len(py_full_word)): for i in range(len(py_full_word)):
#for j in range(i, len(py_full_word) + 1):
py_name_term = py_full_word[i:].strip() py_name_term = py_full_word[i:].strip()
if py_name_term: if py_name_term and py_full_word[i]!="(" and py_full_word[i]!=")":
prefix_weight = py_prefix_weight if len(py_name_term) != len( prefix_weight = py_prefix_weight if len(py_name_term) != len(
py_full_word) else py_full_weight py_full_word) else py_full_weight
suggest_type = 2 if len(py_name_term) != len(py_full_word) else 3 suggest_type = 2 if len(py_name_term) != len(py_full_word) else 3
#term_begin_prefix_weight = begin_prefix_weight if i == 0 else 1.0 term_begin_prefix_weight = begin_prefix_weight if i == 0 else 1.0
suggest_item = { suggest_item = {
"input": [py_name_term], "input": [py_name_term],
"word_weight": (1.0 * len(py_name_term) / len(py_full_word)) * prefix_weight, "word_weight": (1.0 * len(py_name_term) / len(py_full_word)) * prefix_weight * term_begin_prefix_weight,
"suggest_type": suggest_type "suggest_type": suggest_type
} }
if py_name_term[0] not in suggest_dict: if py_name_term[0] not in suggest_dict:
cur_index += 1 cur_index += 1
suggest_item["cur_index"] = cur_index suggest_item["cur_index"] = cur_index
...@@ -89,17 +87,15 @@ def get_tips_suggest_list(instance_cn_name): ...@@ -89,17 +87,15 @@ def get_tips_suggest_list(instance_cn_name):
# 简写 # 简写
if py_acronym_full_word != py_full_word: if py_acronym_full_word != py_full_word:
for i in range(len(py_acronym_full_word)): for i in range(len(py_acronym_full_word)):
#for j in range(i, len(py_acronym_full_word) + 1):
py_acronym_term = py_acronym_full_word[i:].strip() py_acronym_term = py_acronym_full_word[i:].strip()
if py_acronym_term: if py_acronym_term and py_acronym_full_word[i]!="(" and py_acronym_full_word[i]!=")":
prefix_weight = py_acronym_prefix_weight if len(py_acronym_term) != len( prefix_weight = py_acronym_prefix_weight if len(py_acronym_term) != len(
py_acronym_full_word) else py_acronym_full_weight py_acronym_full_word) else py_acronym_full_weight
suggest_type = 4 if len(py_acronym_term) != len(py_acronym_full_word) else 5 suggest_type = 4 if len(py_acronym_term) != len(py_acronym_full_word) else 5
#term_begin_prefix_weight = begin_prefix_weight if i == 0 else 1.0 term_begin_prefix_weight = begin_prefix_weight if i == 0 else 1.0
suggest_item = { suggest_item = {
"input": [py_acronym_term], "input": [py_acronym_term],
"word_weight": (1.0 * len(py_acronym_term) / len( "word_weight": (1.0 * len(py_acronym_term) / len(py_acronym_full_word)) * prefix_weight * term_begin_prefix_weight,
py_acronym_full_word)) * prefix_weight,
"suggest_type": suggest_type "suggest_type": suggest_type
} }
if py_acronym_term[0] not in suggest_dict: if py_acronym_term[0] not in suggest_dict:
...@@ -112,6 +108,7 @@ def get_tips_suggest_list(instance_cn_name): ...@@ -112,6 +108,7 @@ def get_tips_suggest_list(instance_cn_name):
suggest_dict[py_acronym_term[0]]["word_weight"] = suggest_item["word_weight"] suggest_dict[py_acronym_term[0]]["word_weight"] = suggest_item["word_weight"]
suggest_dict[py_acronym_term[0]]["suggest_type"] = suggest_item["suggest_type"] suggest_dict[py_acronym_term[0]]["suggest_type"] = suggest_item["suggest_type"]
return suggest_dict.values() return suggest_dict.values()
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment