|
@@ -53,10 +53,10 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
|
|
this.duplicate(setVideo, v0);
|
|
this.duplicate(setVideo, v0);
|
|
setVideo.addAll(v0.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
setVideo.addAll(v0.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
List<Video> rovRecallRank = new ArrayList<>(v0);
|
|
List<Video> rovRecallRank = new ArrayList<>(v0);
|
|
- //-------------------return相似召回 改为 优质老内容召回------------------
|
|
|
|
- List<Video> v6 = extractAndSort(param, RegionRealtimeRecallStrategyV7LongTermV1.PUSH_FORM);
|
|
|
|
|
|
+ //-------------------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", 10.0).intValue(), v6.size()));
|
|
|
|
|
|
+ v6 = v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 5.0).intValue(), v6.size()));
|
|
rovRecallRank.addAll(v6);
|
|
rovRecallRank.addAll(v6);
|
|
setVideo.addAll(v6.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
setVideo.addAll(v6.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
//-------------------新地域召回------------------
|
|
//-------------------新地域召回------------------
|
|
@@ -77,13 +77,18 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
|
|
sceneCFRosn = sceneCFRosn.subList(0, Math.min(mergeWeight.getOrDefault("sceneCFRosn", 5.0).intValue(), sceneCFRosn.size()));
|
|
sceneCFRosn = sceneCFRosn.subList(0, Math.min(mergeWeight.getOrDefault("sceneCFRosn", 5.0).intValue(), sceneCFRosn.size()));
|
|
rovRecallRank.addAll(sceneCFRosn);
|
|
rovRecallRank.addAll(sceneCFRosn);
|
|
setVideo.addAll(sceneCFRosn.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
setVideo.addAll(sceneCFRosn.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
- //-------------------return相似召回------------------
|
|
|
|
- List<Video> returnv2 = extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM);
|
|
|
|
- returnv2 = returnv2.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
|
|
|
|
- returnv2 = returnv2.subList(0, Math.min(mergeWeight.getOrDefault("returnv2", 5.0).intValue(), returnv2.size()));
|
|
|
|
- rovRecallRank.addAll(returnv2);
|
|
|
|
- setVideo.addAll(returnv2.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
|
|
-
|
|
|
|
|
|
+ //-------------------scene cf rosn------------------
|
|
|
|
+ List<Video> hourROSRecall = extractAndSort(param, RegionRealtimeRecallStrategyROS.PUSH_FORM);
|
|
|
|
+ hourROSRecall = hourROSRecall.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
|
|
|
|
+ hourROSRecall = hourROSRecall.subList(0, Math.min(mergeWeight.getOrDefault("hourROSRecall", 5.0).intValue(), hourROSRecall.size()));
|
|
|
|
+ rovRecallRank.addAll(hourROSRecall);
|
|
|
|
+ setVideo.addAll(hourROSRecall.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
|
|
+ //-------------------长周期ros------------------
|
|
|
|
+ List<Video> LongTermROSRecall = extractAndSort(param, RegionRealtimeRecallStrategyROS.PUSH_FORM);
|
|
|
|
+ LongTermROSRecall = LongTermROSRecall.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
|
|
|
|
+ LongTermROSRecall = LongTermROSRecall.subList(0, Math.min(mergeWeight.getOrDefault("LongTermROSRecall", 1.0).intValue(), LongTermROSRecall.size()));
|
|
|
|
+ rovRecallRank.addAll(LongTermROSRecall);
|
|
|
|
+ setVideo.addAll(LongTermROSRecall.stream().map(Video::getVideoId).collect(Collectors.toSet()));
|
|
|
|
|
|
//-------------------排-------------------
|
|
//-------------------排-------------------
|
|
//-------------------序-------------------
|
|
//-------------------序-------------------
|