Merge branch 'master' of git.wanmeizhensuo.com:ML/ffm-baseline

fix tab

predictDiary.py

@@ -54,6 +54,7 @@ def predict(user_profile):
     ffm_model.predict(DIRECTORY_PATH + "model_{0}-{1}_lr{2}_lambda{3}.out".format(DATA_START_DATE,
                                                                                   DATA_END_DATE, lr, l2_lambda),
                       DIRECTORY_PATH + "result/{0}_output.txt".format(user_profile['device_id']))
+    print("预测结束")
     predict_save_to_local(user_profile, instance)
     predict_save_to_redis(user_profile, instance)
 
@@ -72,12 +73,14 @@ def predict_save_to_local(user_profile, instance):
     proba = wrapper_result(user_profile, instance)
     proba.loc[:, "url"] = proba["cid"].apply(lambda x: "http://m.igengmei.com/diary_book/" + str(x[6:]) + '/')
     proba.to_csv(DIRECTORY_PATH + "result/feed_{}".format(user_profile['device_id']), index=False)
+    print("成功将预测候选集保存到本地")
 
-# TODO 写到redis
+# 预测候选集保存到redis
 def predict_save_to_redis(user_profile, instance):
     device_id = user_profile['device_id']
     cid_list = wrapper_result(user_profile, instance)["cid"].values.tolist()
     add_data_to_redis(device_id,cid_list)
+    print("成功将预测候选集保存到redis")
 
 def router(device_id):
     user_profile, not_exist = fetch_user_profile(device_id)