Merge branch 'h5_agile_control' of algorithm/ad-engine into master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy843.java

@@ -319,6 +319,8 @@ public class RankStrategyBy843 extends RankStrategyBasic {
         double h5PagePlus = NumberUtils.toDouble(paramsMap.getOrDefault("h5PagePlus", "300"));
         double selfPageFactor = NumberUtils.toDouble(paramsMap.getOrDefault("selfPageFactor", "1"));
         double selfPagePlus = NumberUtils.toDouble(paramsMap.getOrDefault("selfPagePlus", "0"));
+        String h5ViewKey = paramsMap.getOrDefault("h5ViewKey", "ad_view_1d");
+        String h5ConverKey = paramsMap.getOrDefault("h5ConverKey", "ad_conversion_1d");
         // calibrate score for negative sampling or cold start
         for (AdRankItem item : result) {
             double originalScore = item.getLrScore();
@@ -334,8 +336,8 @@ public class RankStrategyBy843 extends RankStrategyBasic {
                     double view14D = Double.parseDouble(b3Feature.getOrDefault("ad_view_14d", "0"));
                     double conver14D = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_14d", "0"));
                     double smoothCxr14D = NumUtil.divSmoothV1(conver14D, view14D * h5PageFactor + h5PagePlus, 1.64);
-                    double view1D = Double.parseDouble(b3Feature.getOrDefault("ad_view_1d", "0"));
-                    double conver1D = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_1d", "0"));
+                    double view1D = Double.parseDouble(b3Feature.getOrDefault(h5ViewKey, "0"));
+                    double conver1D = Double.parseDouble(b3Feature.getOrDefault(h5ConverKey, "0"));
                     double smoothCxr1D = NumUtil.divSmoothV1(conver1D, view1D * h5PageFactor + h5PagePlus, 1.64);
                     // 模型打分和统计计算取打分更低的
                     item.getScoreMap().put("cvcvrItemValue", 1.0);
@@ -351,19 +353,12 @@ public class RankStrategyBy843 extends RankStrategyBasic {
                     double view14D = Double.parseDouble(b3Feature.getOrDefault("ad_view_14d", "0"));
                     double conver14D = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_14d", "0"));
                     double smoothCxr14D = NumUtil.divSmoothV1(conver14D, view14D * selfPageFactor + selfPagePlus, 1.64);
-                    double view1D = Double.parseDouble(b3Feature.getOrDefault("ad_view_1d", "0"));
-                    double conver1D = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_1d", "0"));
-                    double smoothCxr1D = NumUtil.divSmoothV1(conver1D, view1D * selfPageFactor + selfPagePlus, 1.64);
                     //模型打分和统计计算取打分更低的
                     item.getScoreMap().put("cvcvrItemValue", 1.0);
                     if (smoothCxr14D <= calibratedScore) {
                         calibratedScore = smoothCxr14D;
                         item.getScoreMap().put("cvcvrItemValue", 2.0);
                     }
-                    if (smoothCxr1D < calibratedScore) {
-                        calibratedScore = smoothCxr1D;
-                        item.getScoreMap().put("cvcvrItemValue", 3.0);
-                    }
                 }
             }
             item.setLrScore(calibratedScore);