Commit 1e8a56a1 by lichenggang

format

parent c815971e
...@@ -46,7 +46,7 @@ if __name__ == '__main__': ...@@ -46,7 +46,7 @@ if __name__ == '__main__':
# data = read_from_excel('DZ0901_V1.4_BOM.xlsx', 'DZ0901_V1.3BOM清单') # data = read_from_excel('DZ0901_V1.4_BOM.xlsx', 'DZ0901_V1.3BOM清单')
# print(data) # print(data)
# print(Classify().fac_test_predic(data)) # print(Classify().fac_test_predic(data))
for i in range(65, 91): # for i in range(65, 91):
print(chr(i)) # print(chr(i))
...@@ -134,9 +134,8 @@ class BasePredictor: ...@@ -134,9 +134,8 @@ class BasePredictor:
return li_sort[0][0] return li_sort[0][0]
@classmethod @classmethod
def get_comprehensive_res(self, pre_std_result, model_std_result): def get_comprehensive_res(self, head_std_result, model_std_result):
print('表头预测结果', pre_std_result)
print('模型预测结果', model_std_result)
vote_count = { vote_count = {
"类别": [], "类别": [],
"参数": [], "参数": [],
...@@ -144,7 +143,7 @@ class BasePredictor: ...@@ -144,7 +143,7 @@ class BasePredictor:
"数量": [], "数量": [],
"品牌": [] "品牌": []
} }
for k, v in pre_std_result.items(): for k, v in head_std_result.items():
vote_count[v].append(k) vote_count[v].append(k)
for k, v in model_std_result.items(): for k, v in model_std_result.items():
......
...@@ -143,6 +143,8 @@ class DicPredict(BasePredictor): ...@@ -143,6 +143,8 @@ class DicPredict(BasePredictor):
if predict_type == 'all': if predict_type == 'all':
head_id_res = self.head_predict(dic_data) head_id_res = self.head_predict(dic_data)
model_id_res = self.model_predict(dic_data) model_id_res = self.model_predict(dic_data)
print('表头预测结果', head_id_res)
print('模型预测结果', model_id_res)
# 表头预测和模型预测最后返回的数据进行综合处理 # 表头预测和模型预测最后返回的数据进行综合处理
head_std_result = head_id_res.get('std_result') head_std_result = head_id_res.get('std_result')
......
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 sign in to comment