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

add test.py for test
 Please enter a commit message to explain why this merge is necessary,

eda/recommended_indexs/getClickZeroUidRateDetail.py

+import datetime
+import pymysql
+
+
+#一周之前的timestamp(1~7)
+my_date1 = datetime.date.today() - datetime.timedelta(days=7)
+my_tm1 = int(my_date1.strftime("%s"))
+#二周之前的timestamp(8_14)
+my_date2 = datetime.date.today() - datetime.timedelta(days=14)
+my_tm2 = int(my_date2.strftime("%s"))
+#一个月之前的timestamp(15~30)
+my_date3 = datetime.date.today() - datetime.timedelta(days=30)
+my_tm3 = int(my_date3.strftime("%s"))
+#两个月之前的timestamp(31~60)
+my_date4 = datetime.date.today() - datetime.timedelta(days=60)
+my_tm4 = int(my_date4.strftime("%s"))
+#三个月之前的timestamp(61~90)
+my_date5 = datetime.date.today() - datetime.timedelta(days=90)
+my_tm5 = int(my_date5.strftime("%s"))
+
+
+def get_rate_detail(platform):
+	if platform == "ios":
+		self.platform = "='App Store'"
+	elif platform == "android":
+		self.platform = "!='App Store'"
+	else:
+		self.platform = " is not null"
+	db = pymysql.connect(host='10.66.157.22', port=4000, user='root', passwd='3SYz54LS9#^9sBvC', db='jerry_test')
+	cursor = db.cursor()
+	sql_tmp = "create temporary table if not exists tmp_table as \
+	(select distinct(device_id) from data_feed_exposure \
+	where device_type{0} \
+	and from_unixtime(time,'%Y-%m-%d')=date_add(curdate(), interval -1 day) \
+	and device_id not in \
+	(select distinct(device_id) from data_feed_click \
+	where from_unixtime(time,'%Y-%m-%d')=date_add(curdate(), interval -1 day) \
+		and device_type{1}))".format(platform,platform.replace(' ','') if platform[-2]=='e' else platform)
+	sql_last = "select count(distinct(device_id)) from tmp_table\
+	where device_id in \
+	(select distinct(device_id) \
+	from data_feed_exposure \
+	where device_id not in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {0})) \
+	union \
+	select count(distinct(device_id)) from tmp_table\
+	where device_id in \
+	(select distinct(device_id) \
+	from data_feed_exposure \
+	where device_id not in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {1}) \
+	and device_id in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {0})) \
+	union \
+	select count(distinct(device_id)) from tmp_table\
+	where device_id in \
+	(select distinct(device_id) \
+	from data_feed_exposure \
+	where device_id not in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {2}) \
+	and device_id in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {1})) \
+	union \
+	select count(distinct(device_id)) from tmp_table\
+	where device_id in \
+	(select distinct(device_id) \
+	from data_feed_exposure \
+	where device_id not in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {3}) \
+	and device_id in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {2})) \
+	union \
+	select count(distinct(device_id)) from tmp_table\
+	where device_id in \
+	(select distinct(device_id) \
+	from data_feed_exposure \
+	where device_id not in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {4}) \
+	and device_id in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {3})) \
+	union \
+	select count(distinct(device_id)) from tmp_table\
+	where device_id in \
+	(select distinct(device_id) \
+	from data_feed_exposure \
+	where device_id in \
+	(select distinct(device_id) from data_feed_exposure \
+		where time < {4}))".format(my_tm1,my_tm2,my_tm3,my_tm4,my_tm5)
+	cursor.execute(sql_tmp)
+	cursor.execute(sql_last)
+	result = cursor.fetchall()
+	db.close()
+	return result
+
+
+
+no_click_uid_detail = get_rate_detail("ios")
+
+
+
+
+

eda/test/getTopFeatures.py → eda/recommended_indexs_v2/getTopFeatures.py

@@ -45,7 +45,6 @@ class TopFeatures(object):
 	def get_result(self, platform, clk_n=2, result_types="ctr"):
 		"""
 		platform : "所有";"苹果","安卓"   #方便显示
-		cid_type : 'diary';'answer';'question';"everything"...   #方便显示
 		clk : dict
 		imp : dict
 		clk_n : 获取topN点击率时，过滤的点击数