Merge branch 'feature/20250317-xgb-to-base' of algorithm/ad-engine into master

ad-engine-server/src/main/resources/ad_score_config_xgboost_20240909.conf

@@ -2,7 +2,7 @@ scorer-config = {
   xgb-score-config = {
     scorer-name = "com.tzld.piaoquan.ad.engine.service.score.scorer.XGBoostScorer683"
     scorer-priority = 99
-    model-path = "zhangbo/model_xgb_351_1000_v2.tar.gz"
+    model-path = "fengzhoutian/model_xgb_351_1000_14d_v1.tar.gz"
   }
 
 }

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

@@ -45,7 +45,7 @@ public class RankStrategyBy680 extends RankStrategyBasic {
     @ApolloJsonValue("${rank.score.weight.680:{}}")
     private Map<String, Double> weightMap;
 
-    @ApolloJsonValue("${rank.score.neg_sample_rate:0.01}")
+    @ApolloJsonValue("${rank.score.neg_sample_rate:0.04}")
     Double negSampleRate;
 
     @PostConstruct
@@ -214,7 +214,6 @@ public class RankStrategyBy680 extends RankStrategyBasic {
         long time5 = System.currentTimeMillis();
 
         // calibrate score for negative sampling
-        /* 02-11 update: 因模型换回基线无采样模型，取消校准
         for (AdRankItem item : result) {
             double originalScore = item.getLrScore();
             double calibratedScore = originalScore / (originalScore + (1 - originalScore) / negSampleRate);
@@ -222,7 +221,6 @@ public class RankStrategyBy680 extends RankStrategyBasic {
             item.getScoreMap().put("originCtcvrScore", originalScore);
             item.getScoreMap().put("ctcvrScore", calibratedScore);
         }
-        */
 
         // loop
         double cpmCoefficient = weightParam.getOrDefault("cpmCoefficient", 0.9);
@@ -610,7 +608,7 @@ public class RankStrategyBy680 extends RankStrategyBasic {
             return;
         }
         synchronized (this) {
-            String bucketFile = "20240718_ad_bucket_688.txt";
+            String bucketFile = "20250217_ad_bucket_688.txt";
             InputStream resourceStream = RankStrategyBy680.class.getClassLoader().getResourceAsStream(bucketFile);
             if (resourceStream != null) {
                 try (BufferedReader reader = new BufferedReader(new InputStreamReader(resourceStream))) {