Merge branch 'master' into pre-master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/container/ThresholdModelContainer.java

@@ -30,7 +30,7 @@ public class ThresholdModelContainer {
     private double position;
 
     public static Map<String,ThresholdPredictModel> modelMap=new HashMap<>();
-    public static Map<Integer,MergingDigest> mergingDigestMap=new HashMap<>();
+//    public static Map<Integer,MergingDigest> mergingDigestMap=new HashMap<>();
 
     private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
     @PostConstruct
@@ -40,21 +40,21 @@ public class ThresholdModelContainer {
             modelMap.put(model.getName(), model);
         });
         //只关注重点app
-        mergingDigestMap.put(0, new MergingDigest(10000));
-        mergingDigestMap.put(3, new MergingDigest(10000));
-        mergingDigestMap.put(4, new MergingDigest(10000));
-        mergingDigestMap.put(5, new MergingDigest(10000));
-        mergingDigestMap.put(21, new MergingDigest(10000));
-        final Runnable task = new Runnable() {
-            public void run() {
-                try {
-                    printDigestThreshold();
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-        };
-        scheduler.scheduleAtFixedRate(task, 0, 1, TimeUnit.MINUTES); // 10分钟
+//        mergingDigestMap.put(0, new MergingDigest(10000));
+//        mergingDigestMap.put(3, new MergingDigest(10000));
+//        mergingDigestMap.put(4, new MergingDigest(10000));
+//        mergingDigestMap.put(5, new MergingDigest(10000));
+//        mergingDigestMap.put(21, new MergingDigest(10000));
+//        final Runnable task = new Runnable() {
+//            public void run() {
+//                try {
+//                    printDigestThreshold();
+//                }catch (Exception e){
+//                    e.printStackTrace();
+//                }
+//            }
+//        };
+//        scheduler.scheduleAtFixedRate(task, 0, 1, TimeUnit.MINUTES); // 10分钟
     }
 
     public static ThresholdPredictModel getThresholdPredictModel(String modelName){
@@ -65,25 +65,25 @@ public class ThresholdModelContainer {
         return modelMap.get("basic");
     }
 
-    public static void mergingDigestAddScore(Integer appType,Double score){
-        mergingDigestMap.getOrDefault(appType,new MergingDigest(1)).add(score);
-    }
-
-    public static double getThresholdByTDigest(Integer appType,Double sortPosition){
-        return  mergingDigestMap.getOrDefault(appType,new MergingDigest(1)).quantile(sortPosition);
-    }
+//    public static void mergingDigestAddScore(Integer appType,Double score){
+//        mergingDigestMap.getOrDefault(appType,new MergingDigest(1)).add(score);
+//    }
 
-    public void printDigestThreshold(){
-        try {
-            for(Map.Entry<Integer,MergingDigest> entry:mergingDigestMap.entrySet()){
-                log.info("svc=printDigestThreshold modelName=modelV2 appType={} mergingDigestThreshold={}"
-                        , entry.getKey(),entry.getValue().quantile(position));
-            }
+//    public static double getThresholdByTDigest(Integer appType,Double sortPosition){
+//        return  mergingDigestMap.getOrDefault(appType,new MergingDigest(1)).quantile(sortPosition);
+//    }
 
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
+//    public void printDigestThreshold(){
+//        try {
+//            for(Map.Entry<Integer,MergingDigest> entry:mergingDigestMap.entrySet()){
+//                log.info("svc=printDigestThreshold modelName=modelV2 appType={} mergingDigestThreshold={}"
+//                        , entry.getKey(),entry.getValue().quantile(position));
+//            }
+//
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+//    }
 
 
 //    public static void main(String[] args){

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/ScoreV2ThresholdPredictModel.java

@@ -8,7 +8,6 @@ import com.tzld.piaoquan.ad.engine.commons.score.ScorerUtils;
 import com.tzld.piaoquan.ad.engine.commons.util.CommonCollectionUtils;
 import com.tzld.piaoquan.ad.engine.commons.util.TimerWatchUtil;
 import com.tzld.piaoquan.ad.engine.service.predict.container.PredictPidContainer;
-import com.tzld.piaoquan.ad.engine.service.predict.container.ThresholdModelContainer;
 import com.tzld.piaoquan.ad.engine.service.predict.impl.PredictModelServiceImpl;
 import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
 import com.tzld.piaoquan.ad.engine.service.remote.FeatureRemoteService;
@@ -115,7 +114,7 @@ public class ScoreV2ThresholdPredictModel extends ThresholdPredictModel {
             adPredict = 2;
         }
         if(maxItem != null){
-            ThresholdModelContainer.mergingDigestAddScore(modelParam.getAppType(),maxItem.getScore());
+//            ThresholdModelContainer.mergingDigestAddScore(modelParam.getAppType(),maxItem.getScore());
             //删除多余打印
             maxItem.setItemFeature(null);
             maxItem.setLrSampleString(null);

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

@@ -106,7 +106,7 @@ public class PidLambdaContainer {
 //                            kp*Double.parseDouble(cols[1])+ki*Double.parseDouble(cols[2])+kd*Double.parseDouble(cols[3]);
 //                  Ecpm = CPA * pctr * pcvr * bid * lambad
 //0.4* （昨天realctcvr / 昨天pctcvr ） + 0.4 * （当天累计realctcvr / 当天的pctcvr ） + 0.2 * （最近一个小时realctcvr / 最近一个小时pctcvr）
-                    Double lambdaNew=kp*getYesterdayLambda(cols)+ki*getTodayLambda(cols)+kp*getLatestHourLambda(cols);
+                    Double lambdaNew=kp*getYesterdayLambda(cols)+ki*getTodayLambda(cols)+kd*getLatestHourLambda(cols);
                     temp.put(creativeId,lambdaNew);
                     log.error("svc=calNewLambda creativeId={} lambdaNew={}", creativeId,lambdaNew);
                 }catch (Exception e){