update

video_rank.py

@@ -656,36 +656,34 @@ def video_new_rank2(data, size, top_K, flow_pool_P, ab_code, flowConfig=None):
         # 按概率 p 及score排序获取 size - k 个视频
     flow_num = 0
     if flowConfig == "1" and len(rov_recall_rank) > 0:
-        if flowConfig == "1" and len(rov_recall_rank) > 0:
-            for recall_item in rank_result:
-                flow_recall_name = recall_item.get("flowPool", '')
-                flow_num = flow_num + 1
-            all_recall_rank = rov_recall_rank + flow_recall_rank
-            if flow_num > 0:
-                rank_result.extend(all_recall_rank[:size - top_K])
-                return  rank_result, flow_num
-            else:
-                i = 0
-                while i < size - top_K:
-                    # 随机生成[0, 1)浮点数
-                    rand = random.random()
-                    # log_.info('rand: {}'.format(rand))
-                    if rand < flow_pool_P:
-                        if flow_recall_rank:
-                            rank_result.append(flow_recall_rank[0])
-                            flow_recall_rank.remove(flow_recall_rank[0])
-                        else:
-                            rank_result.extend(rov_recall_rank[:size - top_K - i])
-                            return rank_result[:size], flow_num
+        for recall_item in rank_result:
+            flow_recall_name = recall_item.get("flowPool", '')
+            flow_num = flow_num + 1
+        all_recall_rank = rov_recall_rank + flow_recall_rank
+        if flow_num > 0:
+            rank_result.extend(all_recall_rank[:size - top_K])
+            return rank_result, flow_num
+        else:
+            i = 0
+            while i < size - top_K:
+                # 随机生成[0, 1)浮点数
+                rand = random.random()
+                # log_.info('rand: {}'.format(rand))
+                if rand < flow_pool_P:
+                    if flow_recall_rank:
+                        rank_result.append(flow_recall_rank[0])
+                        flow_recall_rank.remove(flow_recall_rank[0])
                     else:
-                        if rov_recall_rank:
-                            rank_result.append(rov_recall_rank[0])
-                            rov_recall_rank.remove(rov_recall_rank[0])
-                        else:
-                            rank_result.extend(flow_recall_rank[:size - top_K - i])
-                            return rank_result[:size], flow_num
-                    i += 1
-
+                        rank_result.extend(rov_recall_rank[:size - top_K - i])
+                        return rank_result[:size], flow_num
+                else:
+                    if rov_recall_rank:
+                        rank_result.append(rov_recall_rank[0])
+                        rov_recall_rank.remove(rov_recall_rank[0])
+                    else:
+                        rank_result.extend(flow_recall_rank[:size - top_K - i])
+                        return rank_result[:size], flow_num
+                i += 1
     else:
         i = 0
         while i < size - top_K: