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

change sql for test

eda/test/getTopFeatures.py

@@ -88,11 +88,12 @@ class TopFeatures(object):
 
 	def result2file(self, result_lst, fpath):
 		"""
-		result_lst : [all,ios,android]
+		result_lst : [all_result,ios_result,android_result]
 		fpath : output filename
 		rtype : none
 		"""
 		with open(fpath, 'w') as f:
+
 			tplt = "{0:\u3000<4}\t{1:\u3000<12}\t{2:\u3000^6}\t{3:\u3000^6}\t{4:\u3000<8}\t{5:\u3000^15}\n"
 			f.write("Top {0} {1}\n".format(self.top_n,self.cid_type))
 			sep = "=================================================================\n"
@@ -111,22 +112,24 @@ class TopFeatures(object):
 
 
 def main():
-	top_diary = TopFeatures(1, "all", "diary", 100)
-	clk_diary_times_all = top_diary.get_click_times()
-	imp_diary_times_all = top_diary.get_impression_times()
-	clk_diary_ctr_all = top_diary.get_result(clk_diary_times_all, imp_diary_times_all, 4, "ctr")
+	top_answer_all = TopFeatures(1, "all", "answer", 100)
+	clk_answer_times_all = top_answer.get_click_times()
+	imp_answer_times_all = top_answer.get_impression_times()
+	clk_answer_ctr_all = top_answer.get_result(clk_answer_times_all, imp_answer_times_all, 4, "ctr")
 
-	clk_diary_times_ios = top_diary.get_click_times()
-	imp_diary_times_ios = top_diary.get_impression_times()
-	clk_diary_ctr_ios = top_diary.get_result(clk_diary_times_ios, imp_diary_times_ios, 4, "ctr")
+	top_answer_all = TopFeatures(1, "ios", "answer", 100)
+	clk_answer_times_ios = top_answer.get_click_times()
+	imp_answer_times_ios = top_answer.get_impression_times()
+	clk_answer_ctr_ios = top_answer.get_result(clk_answer_times_ios, imp_answer_times_ios, 4, "ctr")
 
-	clk_diary_times_android = top_diary.get_click_times()
-	imp_diary_times_android = top_diary.get_impression_times()
-	clk_diary_ctr_android = top_diary.get_result(clk_diary_times_android, imp_diary_times_android, 4, "ctr")
+	top_answer_all = TopFeatures(1, "android", "answer", 100)
+	clk_answer_times_android = top_answer.get_click_times()
+	imp_answer_times_android = top_answer.get_impression_times()
+	clk_answer_ctr_android = top_answer.get_result(clk_answer_times_android, imp_answer_times_android, 4, "ctr")
 
 	result_lst = [clk_diary_ctr_all, clk_diary_ctr_ios, clk_diary_ctr_android]
-	output_path = DIRECTORY_PATH + "5top100_ctr_diary_%s.txt".format(get_yesterday_date())
-	top_diary.result2file(result_lst, output_path)
+	output_path = DIRECTORY_PATH + "top100_ctr_diary_%s.txt".format(get_yesterday_date())
+	top_answer_all.result2file(result_lst, output_path)