Merge branch 'similar_sort' into 'master'

modify linucb

See merge request !142

linucb/views/collect_data.py

@@ -103,7 +103,7 @@ class CollectData(object):
 
                     reward = 1 if is_click or is_vote else 0
 
-                    logging.info("positive tag_list,device_id:%s,tag_list:%s" % (str(device_id), str(tag_list)))
+                    logging.info("positive tag_list,device_id:%s,topic_id:%s,tag_list:%s" % (str(device_id), str(topic_id), str(tag_list)))
                     for tag_id in tag_list:
                         self.update_user_linucb_tag_info(reward,device_id,tag_id,user_feature)
 
@@ -121,17 +121,17 @@ class CollectData(object):
                         for sql_item in sql_query_results:
                             tag_list.append(sql_item.tag_id)
 
-                            is_click = 0
-                            is_vote = 0
+                        is_click = 0
+                        is_vote = 0
 
-                            reward = 1 if is_click or is_vote else 0
+                        reward = 1 if is_click or is_vote else 0
 
-                            logging.info("negative tag_list,device_id:%s,tag_list:%s" % (str(device_id),str(tag_list)))
-                            for tag_id in tag_list:
-                                self.update_user_linucb_tag_info(reward,device_id,tag_id,user_feature)
+                        logging.info("negative tag_list,device_id:%s,topic_id:%s,tag_list:%s" % (str(device_id),str(exposure_topic_id),str(tag_list)))
+                        for tag_id in tag_list:
+                            self.update_user_linucb_tag_info(reward,device_id,tag_id,user_feature)
 
-                            # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
-                            self.update_recommend_tag_list(device_id, user_feature)
+                        # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
+                        self.update_recommend_tag_list(device_id, user_feature)
                 else:
                     logging.warning("unknown type msg:%s" % raw_val_dict.get("type","missing type"))