Merge branch 'ocpm_bid_engine_scores'

# Conflicts:
#	ad-engine-service/pom.xml

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

@@ -9,9 +9,14 @@ scorer-config = {
       scorer-priority = 98
       model-path = "ad_cvr_model/model_ad_cvr.txt"
   }
+    tf-ctr-score-config = {
+      scorer-name = "com.tzld.piaoquan.ad.engine.service.score.VlogAdThompsonScorer"
+      scorer-priority = 97
+      model-path = "ad_thompson_model/model_ad_thompson.txt"
+    }
   lr-ecpm-merge-config = {
       scorer-name = "com.tzld.piaoquan.ad.engine.service.score.VlogMergeEcpmScorer"
-      scorer-priority = 97
+      scorer-priority = 1
   }
 
 }

ad-engine-service/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-feature-client</artifactId>
-            <version>1.0.7</version>
+            <version>1.0.8</version>
         </dependency>
 
     </dependencies>

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -63,6 +63,10 @@ public class PredictModelServiceImpl implements PredictModelService {
             result.put("msg","abConfig_error");
             return result;
         }
+        //市-中文
+        requestParam.setRegion(requestParam.getRegion().replace("省",""));
+        requestParam.setCity(requestParam.getCity().replace("市",""));
+
 
         // Determine the group to which mid belongs
         String groupClassKey = (String) abtestParam.get("group_class_key");

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

@@ -88,7 +88,6 @@ public class FeatureRemoteService {
 
         feature.setAdId(Long.parseLong(proto.getAdId()));
         feature.setItemFeature(FeatureConvert.convertToJava(proto));
-        System.out.println(feature);
         return feature;
     }
 

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

@@ -41,15 +41,16 @@ public class VlogMergeEcpmScorer extends BaseLRModelScorer {
 
 
     public List<AdRankItem> mergetEcpm(List<AdRankItem> items) {
-        long startTime = System.currentTimeMillis();
+
 
         for (AdRankItem item : items) {
             try {
+                boolean isTfType=item.getItemFeature().getCreative_7day_cnt_features().getAdView()<7;
                 double cpa = item.getCpa();
                 double bid1 = item.getBid1();
                 double bid2 = item.getBid2();
-                double pctr = item.getCtr();
-                double pcvr = item.getCvr();
+                double pctr = isTfType?item.getTf_ctr():item.getCtr();
+                double pcvr = isTfType?item.getTf_cvr():item.getCvr();
                 //todo
                 double ecpm = cpa * bid1 * bid2 * pcvr * pctr * 1000d;
 //                double ecpm = cpa * bid1 * bid2 * pcvr * pctr;