liqian 1 vuosi sitten
vanhempi
commit
a1695105e7
1 muutettua tiedostoa jossa 14 lisäystä ja 4 poistoa
  1. 14 4
      video_rank.py

+ 14 - 4
video_rank.py

@@ -22,8 +22,15 @@ def video_rank(data, size, top_K, flow_pool_P, flow_pool_recall_process=None):
     :param flow_pool_P: size-top_K视频为流量池视频的概率 type-float
     :return: rank_result
     """
+    # add_flow_pool_recall_log
+    if flow_pool_recall_process is None:
+        flow_pool_recall_process = {}
+
     if not data['rov_pool_recall'] and not data['flow_pool_recall']:
+        # add_flow_pool_recall_log
         return [], flow_pool_recall_process
+        # return []
+
     # 将各路召回的视频按照score从大到小排序
     # 最惊奇相关推荐相似视频
     # relevant_recall = [item for item in data['rov_pool_recall']
@@ -121,8 +128,6 @@ def video_rank(data, size, top_K, flow_pool_P, flow_pool_recall_process=None):
     rank_result = []
 
     # add_flow_pool_recall_log
-    if flow_pool_recall_process is None:
-        flow_pool_recall_process = {}
     flow_pool_recall_process['recall_duplicate_res'] = {'rov_recall_rank': rov_recall_rank,
                                                         'flow_recall_rank': flow_recall_rank}
 
@@ -796,8 +801,15 @@ def video_new_rank3(data, size, top_K, flow_pool_P, rank_key_prefix='rank:score1
         :return: rank_result
     """
     redis_helper = RedisHelper()
+
+    # add_flow_pool_recall_log
+    if flow_pool_recall_process is None:
+        flow_pool_recall_process = {}
+
     if not data['rov_pool_recall'] and not data['flow_pool_recall']:
+        # add_flow_pool_recall_log
         return [], 0, flow_pool_recall_process
+        # return [], 0
 
     rov_recall_rank = data['rov_pool_recall']
     vid_keys = []
@@ -829,8 +841,6 @@ def video_new_rank3(data, size, top_K, flow_pool_P, rank_key_prefix='rank:score1
     rank_result = []
 
     # add_flow_pool_recall_log
-    if flow_pool_recall_process is None:
-        flow_pool_recall_process = {}
     flow_pool_recall_process['recall_duplicate_res'] = {'rov_recall_rank': rov_recall_rank, 'flow_recall_rank': flow_recall_rank}
 
     # 从ROV召回池中获取top k