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

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/model/PAIModelV1.java

@@ -119,22 +119,22 @@ public class PAIModelV1 {
             "timediff_view", "vid_rank_ctcvr_14d", "vid_rank_ctcvr_1d", "vid_rank_ctcvr_3d", "vid_rank_ctcvr_7d",
             "vid_rank_ctr_14d", "vid_rank_ctr_1d", "vid_rank_ctr_3d", "vid_rank_ctr_7d", "vid_rank_ecpm_14d", "vid_rank_ecpm_1d",
             "vid_rank_ecpm_3d", "vid_rank_ecpm_7d",
-            "j1_3d_ctcvr", "j1_3d_ctr",
-            "j2_3d_ctcvr", "j2_3d_ctr",
-            "j3_3h_ctcvr", "j3_3h_ctr", "j3_3d_ctcvr", "j3_3d_ctr",
-            "j4_3d_ctcvr", "j4_3d_ctr",
-            "j5_3d_ctcvr", "j5_3d_ctr",
+            "j1_3d_conver_x_log_view", "j1_3d_conver", "j1_3d_ctcvr", "j1_3d_ctr",
+            "j2_3d_conver_x_log_view", "j2_3d_conver", "j2_3d_ctcvr", "j2_3d_ctr",
+            "j3_3h_conver_x_log_view", "j3_3h_conver", "j3_3h_ctcvr", "j3_3h_ctr", "j3_3d_conver_x_log_view", "j3_3d_conver", "j3_3d_ctcvr", "j3_3d_ctr",
+            "j4_3d_conver_x_log_view", "j4_3d_conver", "j4_3d_ctcvr", "j4_3d_ctr",
+            "j5_3d_conver_x_log_view", "j5_3d_conver", "j5_3d_ctcvr", "j5_3d_ctr",
             "j6_1h_click", "j6_1h_conver", "j6_1h_conver_x_ctcvr", "j6_1h_conver_x_log_view", "j6_1h_ctcvr", "j6_1h_ctr", "j6_1h_cvr", "j6_1h_ecpm",
             "j6_2h_click", "j6_2h_conver", "j6_2h_conver_x_ctcvr", "j6_2h_conver_x_log_view", "j6_2h_ctcvr", "j6_2h_ctr", "j6_2h_cvr", "j6_2h_ecpm",
             "j6_3h_click", "j6_3h_conver", "j6_3h_conver_x_ctcvr", "j6_3h_conver_x_log_view", "j6_3h_ctcvr", "j6_3h_ctr", "j6_3h_cvr", "j6_3h_ecpm",
             "j6_6h_ctr", "j6_6h_ecpm",
             "j6_12h_click", "j6_12h_conver", "j6_12h_conver_x_ctcvr", "j6_12h_conver_x_log_view", "j6_12h_ctcvr", "j6_12h_ctr", "j6_12h_cvr", "j6_12h_ecpm",
             "j6_3d_click", "j6_3d_conver", "j6_3d_conver_x_ctcvr", "j6_3d_conver_x_log_view", "j6_3d_ctcvr", "j6_3d_ctr", "j6_3d_cvr", "j6_3d_ecpm",
-            "j7_3d_ctcvr", "j7_3d_ctr",
-            "j8_3d_ctcvr", "j8_3d_ctr",
-            "j9_3d_ctcvr", "j9_3d_ctr", "j9_3h_ctcvr", "j9_3h_ctr",
-            "j10_3d_ctcvr", "j10_3d_ctr",
-            "j11_3d_ctcvr", "j11_3d_ctr"
+            "j7_3d_conver_x_log_view", "j7_3d_conver", "j7_3d_ctcvr", "j7_3d_ctr",
+            "j8_3d_conver_x_log_view", "j8_3d_conver", "j8_3d_ctcvr", "j8_3d_ctr",
+            "j9_3d_conver_x_log_view", "j9_3d_conver", "j9_3d_ctcvr", "j9_3d_ctr", "j9_3h_conver_x_log_view", "j9_3h_conver", "j9_3h_ctcvr", "j9_3h_ctr",
+            "j10_3d_conver_x_log_view", "j10_3d_conver", "j10_3d_ctcvr", "j10_3d_ctr",
+            "j11_3d_conver_x_log_view", "j11_3d_conver", "j11_3d_ctcvr", "j11_3d_ctr"
     };
 
     /**