|
@@ -214,10 +214,11 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
|
|
|
double vor24h = Double.parseDouble(vidFeatureMap.getOrDefault("vor_24h", "0"));
|
|
|
double vor = this.handleVor(vor24h, calcVorMode, item, mergeWeight);
|
|
|
|
|
|
- double originScoreRos = item.getScoreRos();
|
|
|
+ // double originScoreRos = item.getScoreRos();
|
|
|
+ double originScoreRos = Double.parseDouble(vidFeatureMap.getOrDefault("ros_24h", "0d"));
|
|
|
double scoreRos = this.handleRos(originScoreRos, calcRosMode, item, mergeWeight);
|
|
|
|
|
|
- double rosAdd = mergeWeight.getOrDefault("ros_add", 0.00001);
|
|
|
+ double rosAdd = mergeWeight.getOrDefault("ros_add", 0.1);
|
|
|
double vorAdd = mergeWeight.getOrDefault("vor_add", 0.1);
|
|
|
|
|
|
item.getScoresMap().put("hasReturnRovScore", scoreRos);
|
|
@@ -225,7 +226,7 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
|
|
|
item.getScoresMap().put("vor", vor);
|
|
|
item.getScoresMap().put("calcVorMode", calcVorMode);
|
|
|
item.getScoresMap().put("calcRosMode", calcRosMode);
|
|
|
- item.getScoresMap().put("RosXGBScore", originScoreRos);
|
|
|
+ item.getScoresMap().put("originRos", originScoreRos);
|
|
|
item.getScoresMap().put("rosAdd", rosAdd);
|
|
|
item.getScoresMap().put("vorAdd", vorAdd);
|
|
|
score = fmRov * (rosAdd + scoreRos) * (vorAdd + vor);
|
|
@@ -270,14 +271,14 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- double scoreRos = ExtractorUtils.inverseLog(originScoreRos);
|
|
|
+ double scoreRos = originScoreRos;
|
|
|
if (calcRosMode == 1d) {
|
|
|
double rosPower = mergeWeight.getOrDefault("le_ros_power", 5d);
|
|
|
if (scoreRos > 1) {
|
|
|
rosPower = mergeWeight.getOrDefault("gt_1_ros_poewr", 1.5d);
|
|
|
}
|
|
|
item.getScoresMap().put("rosPower", rosPower);
|
|
|
- scoreRos = Math.pow(scoreRos, rosPower);
|
|
|
+ scoreRos = Math.pow(ExtractorUtils.inverseLog(originScoreRos), rosPower);
|
|
|
} else if (calcRosMode == 2d) {
|
|
|
double modelRosCoefficient = mergeWeight.getOrDefault("model_ros_coefficient", 8d);
|
|
|
item.getScoresMap().put("modelRosCoefficient", modelRosCoefficient);
|
|
@@ -285,7 +286,7 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
|
|
|
} else if (calcRosMode == 3d) {
|
|
|
double rosPower = mergeWeight.getOrDefault("ros_power", 5d);
|
|
|
item.getScoresMap().put("rosPower", rosPower);
|
|
|
- scoreRos = Math.pow(scoreRos, rosPower);
|
|
|
+ scoreRos = Math.pow(ExtractorUtils.inverseLog(originScoreRos), rosPower);
|
|
|
}
|
|
|
|
|
|
return scoreRos;
|