feat:VOV排序迭代

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV565.java

@@ -65,13 +65,13 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
         List<Video> rovRecallRank = new ArrayList<>(v0);
         //-------------------return相似召回------------------
         List<Video> v6 = extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM);
-        v6 = v6.stream().filter(r-> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
+        v6 = v6.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
         v6 = v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 5.0).intValue(), v6.size()));
         rovRecallRank.addAll(v6);
         setVideo.addAll(v6.stream().map(Video::getVideoId).collect(Collectors.toSet()));
         //-------------------新地域召回------------------
         List<Video> v1 = extractAndSort(param, RegionRealtimeRecallStrategyV1.PUSH_FORM);
-        v1 = v1.stream().filter(r-> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
+        v1 = v1.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
         v1 = v1.subList(0, Math.min(mergeWeight.getOrDefault("v1", 5.0).intValue(), v1.size()));
         rovRecallRank.addAll(v1);
         setVideo.addAll(v1.stream().map(Video::getVideoId).collect(Collectors.toSet()));
@@ -337,7 +337,7 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
         // 融合权重
         double alpha_vov = mergeWeight.getOrDefault("alpha_vov", 1.0);
 
-        double vov_thresh = mergeWeight.getOrDefault("vov_thresh", -1d);
+        double vov_thresh = mergeWeight.getOrDefault("vov_thresh", 0d);
 
         double view_thresh = mergeWeight.getOrDefault("view_thresh", 1500.0);
 
@@ -357,7 +357,6 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
         weightList.add(mergeWeight.getOrDefault("h1_ago_vov_w", 0.0));
 
 
-
         Map<String, Map<String, String>> vid2MapFeature = this.getVideoRedisFeature(vids, "redis:vid_hasreturn_rov:");
         Map<String, Map<String, String>> vid2VovFeatureMap = this.getVideoRedisFeature(vids, "redis:vid_vovhour4rank:");
         List<Video> result = new ArrayList<>();
@@ -406,7 +405,6 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             item.getScoresMap().put("vov_thresh", vov_thresh);
 
 
-
             List<Double> featureList = new ArrayList<>(3);
             // featureList.add(d2_ago_vov);
             // featureList.add(d1_ago_vov);
@@ -425,7 +423,7 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
             double hasReturnRovScore = Double.parseDouble(vid2MapFeature.getOrDefault(item.getVideoId() + "", new HashMap<>())
                     .getOrDefault("rate_n", "0"));
             item.getScoresMap().put("hasReturnRovScore", hasReturnRovScore);
-            score = fmRov * (1 + hasReturnRovScore)  * (1.0 + alpha_vov * vov_p);
+            score = fmRov * (1 + hasReturnRovScore) * (1.0 + alpha_vov * vov_p);
 
 
             item.getScoresMap().put("vov_p", vov_p);
@@ -452,8 +450,8 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
     }
 
 
-    private  double calculateScore(List<Double> featureList, List<Double> weightList,RankItem rankItem,
-                                   double vov_thresh, double view_thresh, double h1_ago_view,double level50_vov,double level_95_vov,double beta_vov) {
+    private double calculateScore(List<Double> featureList, List<Double> weightList, RankItem rankItem,
+                                  double vov_thresh, double view_thresh, double h1_ago_view, double level50_vov, double level_95_vov, double beta_vov) {
         // 检查 h1_ago_view 条件
         if (h1_ago_view == -2 || h1_ago_view == -1 || h1_ago_view < view_thresh) {
             rankItem.getScoresMap().put("origin_vov_p", 0d);
@@ -489,6 +487,7 @@ public class RankStrategy4RegionMergeModelV565 extends RankStrategy4RegionMergeM
         }
         rankItem.getScoresMap().put("origin_vov_p", score);
         // 调整vov
+        // 调整vov
         if (score < vov_thresh) {
             score = 0;
         } else {