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

..

ctr_search.py

@@ -29,7 +29,7 @@ def get_data():
 def ctr_all():
     db = pymysql.connect(host='10.66.157.22', port=4000, user='root', passwd='3SYz54LS9#^9sBvC', db='jerry_prod')
     cursor = db.cursor()
-    sql_active = "select distinct device_id from data_feed_exposure where (cid_type = 'diary' or cid_type = 'diary_video') " \
+    sql_active = "select distinct device_id from data_feed_exposure where cid_type = 'diary'" \
                  "and device_id regexp'[7|8]$' and stat_date = '{}';".format(date)
     cursor.execute(sql_active)
     result = cursor.fetchall()
@@ -43,14 +43,14 @@ def ctr_all():
     print("当天尾号7或8活跃用户覆盖率：")
     print(cover_percent)
     sql_click = "select count(cid) from data_feed_click " \
-                "where (cid_type = 'diary' or cid_type = 'diary_video') " \
-                "and stat_date = '{}' and device_id regexp '[5|6]$';".format(date)
+                "where cid_type = 'diary'" \
+                "and stat_date = '{}' and device_id regexp '[7|8]$';".format(date)
     cursor.execute(sql_click)
     click = cursor.fetchone()[0]
     print("点击数：" + str(click))
     sql_exp = "select count(cid) from data_feed_exposure " \
-              "where (cid_type = 'diary' or cid_type = 'diary_video') and stat_date = '{}' and " \
-              "device_id regexp '[5|6]$'".format(date)
+              "where cid_type = 'diary' and stat_date = '{}' and " \
+              "device_id regexp '[7|8]$'".format(date)
     cursor.execute(sql_exp)
     exp = cursor.fetchone()[0]
     print("曝光数：" + str(exp))
@@ -60,7 +60,7 @@ def ctr_all():
 
 def ctr():
     sql_click = "select count(cid) from data_feed_click " \
-              "where (cid_type = 'diary' or cid_type = 'diary_video') " \
+              "where cid_type = 'diary'" \
                 "and stat_date = '{}' and device_id in {};".format(date,device_id)
     db = pymysql.connect(host='10.66.157.22', port=4000, user='root', passwd='3SYz54LS9#^9sBvC', db='jerry_prod')
     cursor = db.cursor()
@@ -68,7 +68,7 @@ def ctr():
     click = cursor.fetchone()[0]
     print("实验用户点击数："+str(click))
     sql_exp = "select count(cid) from data_feed_exposure " \
-              "where (cid_type = 'diary' or cid_type = 'diary_video') and stat_date = '{}' and " \
+              "where cid_type = 'diary' and stat_date = '{}' and " \
               "device_id in {}".format(date,device_id)
     cursor.execute(sql_exp)
     exp = cursor.fetchone()[0]
@@ -79,7 +79,7 @@ def ctr():
 
 
 def rate2file():
-    output_path = DIRECTORY_PATH + "56ctr.csv"
+    output_path = DIRECTORY_PATH + "search_ctr.csv"
     with open(output_path,'a+') as f:
         line = date.replace('-', '')+','+str(temp_data[0])+','+str(temp_data[1])+','+str(temp_data[2])+\
                ","+str(data[0])+","+str(data[1])+","+str(data[2])+","+str(data[3])+","+str(data[4])\