Browse Source

Merge branch 'w-h-rate' into pre-master

liqian 3 years ago
parent
commit
bc4600cf04
1 changed files with 14 additions and 14 deletions
  1. 14 14
      video_rank.py

+ 14 - 14
video_rank.py

@@ -228,10 +228,9 @@ def video_rank_by_w_h_rate(videos):
             top2_index.append(horizontal_video_index[0])
             # 从横屏位置记录中移除
             horizontal_video_index.pop(0)
-        elif i == 1:
+        elif i == 0:
             return videos
-        elif i == 2:
-            top2_index.append(i)
+
     # 重排
     flow_result = [videos[i] for i in flow_video_index]
     other_result = [videos[i] for i in range(len(videos)) if i not in top2_index and i not in flow_video_index]
@@ -245,7 +244,7 @@ def video_rank_by_w_h_rate(videos):
         top2_result.append(item)
 
     new_rank_result = top2_result
-    for i in range(2, len(videos)):
+    for i in range(len(top2_index), len(videos)):
         if i in flow_video_index:
             new_rank_result.append(flow_result[0])
             flow_result.pop(0)
@@ -256,15 +255,16 @@ def video_rank_by_w_h_rate(videos):
 
 
 if __name__ == '__main__':
-    d_test = [{'videoId': 1, 'rovScore': 10, 'pushFrom': 'op_manual', 'abCode': 10000},
-              {'videoId': 1919925, 'rovScore': 9, 'pushFrom': 'recall_pool', 'abCode': 10000},
-              {'videoId': 3, 'rovScore': 8, 'pushFrom': 'recall_pool', 'abCode': 10000},
-              {'videoId': 4, 'rovScore': 7, 'pushFrom': 'flow_pool', 'abCode': 10000},
-              {'videoId': 5, 'rovScore': 6, 'pushFrom': 'flow_pool', 'abCode': 10000},
-              {'videoId': 6, 'rovScore': 5, 'pushFrom': 'recall_pool', 'abCode': 10000},
-              {'videoId': 3674236, 'rovScore': 4, 'pushFrom': 'recall_pool', 'abCode': 10000},
-              {'videoId': 3247671, 'rovScore': 3, 'pushFrom': 'recall_pool', 'abCode': 10000},
-              {'videoId': 7837973, 'rovScore': 2, 'pushFrom': 'recall_pool', 'abCode': 10000}]
+    d_test = [{'videoId': 10028734, 'rovScore': 99.977, 'pushFrom': 'recall_pool', 'abCode': 10000},
+              {'videoId': 1919925, 'rovScore': 99.974, 'pushFrom': 'recall_pool', 'abCode': 10000},
+              {'videoId': 9968118, 'rovScore': 99.972, 'pushFrom': 'recall_pool', 'abCode': 10000},
+              {'videoId': 9934863, 'rovScore': 99.971, 'pushFrom': 'recall_pool', 'abCode': 10000},
+              {'videoId': 10219869, 'flowPool': '1#1#1#1640830818883', 'rovScore': 82.21929728934731, 'pushFrom': 'flow_pool', 'abCode': 10000},
+              {'videoId': 10212814, 'flowPool': '1#1#1#1640759014984', 'rovScore': 81.26694187726412, 'pushFrom': 'flow_pool', 'abCode': 10000},
+              {'videoId': 10219437, 'flowPool': '1#1#1#1640827620520', 'rovScore': 81.21634156641908, 'pushFrom': 'flow_pool', 'abCode': 10000},
+              {'videoId': 1994050, 'rovScore': 99.97, 'pushFrom': 'recall_pool', 'abCode': 10000},
+              {'videoId': 9894474, 'rovScore': 99.969, 'pushFrom': 'recall_pool', 'abCode': 10000},
+              {'videoId': 10028081, 'rovScore': 99.966, 'pushFrom': 'recall_pool', 'abCode': 10000}]
     res = video_rank_by_w_h_rate(videos=d_test)
     for tmp in res:
-        print(tmp)
+        print(tmp)