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

change format App Store and add a test/main.py

predictDiary.py

@@ -98,7 +98,7 @@ if __name__ == "__main__":
         start = time.time()
         empty,device_id_list = get_active_users()
         if empty:
-            time.sleep(10)
+            time.sleep(60)
         else:
             old_device_id_list = pd.read_csv(DIRECTORY_PATH + "data_set_device_id.csv")["device_id"].values.tolist()
             for device_id in device_id_list:

processData.py

@@ -60,7 +60,7 @@ def feature_en():
     print(cid_df.head(2))
     cid_df.to_csv(DIRECTORY_PATH + "data_set_cid.csv", index=False)
 
-    # 将device_id 保存。目的是为了判断预测的device_id是否在这个集合里,如果不在，不需要预测
+    # 将device_id 保存,目的是为了判断预测的device_id是否在这个集合里,如果不在，不需要预测
     data_set_device_id = data["device_id"].unique()
     device_id_df = pd.DataFrame()
     device_id_df['device_id'] = data_set_device_id

train.py

@@ -8,7 +8,7 @@ if __name__ == "__main__":
     data, test_number, validation_number = feature_en()
     ffm_transform(data, test_number, validation_number)
     train()
-    print("end")
-    # print('---------------prepare candidates--------------')
-    # get_eachCityDiaryTop3000()
 
+    print('---------------prepare candidates--------------')
+    get_eachCityDiaryTop3000()
+    print("end")