Merge branch 'feature/zhangbo_rank' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV1.java

@@ -229,7 +229,7 @@ public class RankStrategy4RegionMergeModelV1 extends RankService {
                 JSONObject obj = new JSONObject();
                 obj.put("name", "user_key_in_model_is_null");
                 obj.put("class", this.CLASS_NAME);
-                log.info(obj.toString());
+//                log.info(obj.toString());
 //                return videos;
             }
         }
@@ -259,7 +259,7 @@ public class RankStrategy4RegionMergeModelV1 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
+//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -394,17 +394,17 @@ public class RankStrategy4RegionMergeModelV1 extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
+//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
 
 
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
+//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
         JSONObject obj = new JSONObject();
         obj.put("name", "user_key_in_model_is_not_null");
         obj.put("class", this.CLASS_NAME);
-        log.info(obj.toString());
+//        log.info(obj.toString());
         return rovRecallScore;
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV2.java

@@ -228,7 +228,7 @@ public class RankStrategy4RegionMergeModelV2 extends RankService {
                 JSONObject obj = new JSONObject();
                 obj.put("name", "user_key_in_model_is_null");
                 obj.put("class", this.CLASS_NAME);
-                log.info(obj.toString());
+//                log.info(obj.toString());
 //                return videos;
             }
         }
@@ -258,7 +258,7 @@ public class RankStrategy4RegionMergeModelV2 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
+//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -393,17 +393,17 @@ public class RankStrategy4RegionMergeModelV2 extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
+//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
 
 
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
+//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
         JSONObject obj = new JSONObject();
         obj.put("name", "user_key_in_model_is_not_null");
         obj.put("class", this.CLASS_NAME);
-        log.info(obj.toString());
+//        log.info(obj.toString());
         return rovRecallScore;
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV3.java

@@ -334,7 +334,7 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
                 JSONObject obj = new JSONObject();
                 obj.put("name", "user_key_in_model_is_null");
                 obj.put("class", this.CLASS_NAME);
-                log.info(obj.toString());
+//                log.info(obj.toString());
 //                return videos;
             }
         }
@@ -364,7 +364,7 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
+//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -500,17 +500,17 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
+//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
 
 
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
+//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
         JSONObject obj = new JSONObject();
         obj.put("name", "user_key_in_model_is_not_null");
         obj.put("class", this.CLASS_NAME);
-        log.info(obj.toString());
+//        log.info(obj.toString());
         return rovRecallScore;
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV4.java

@@ -253,7 +253,7 @@ public class RankStrategy4RegionMergeModelV4 extends RankService {
                 JSONObject obj = new JSONObject();
                 obj.put("name", "user_key_in_model_is_null");
                 obj.put("class", this.CLASS_NAME);
-                log.info(obj.toString());
+//                log.info(obj.toString());
 //                return videos;
             }
         }
@@ -283,7 +283,7 @@ public class RankStrategy4RegionMergeModelV4 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
+//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -418,17 +418,17 @@ public class RankStrategy4RegionMergeModelV4 extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
+//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
 
 
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
+//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
         JSONObject obj = new JSONObject();
         obj.put("name", "user_key_in_model_is_not_null");
         obj.put("class", this.CLASS_NAME);
-        log.info(obj.toString());
+//        log.info(obj.toString());
         return rovRecallScore;
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV5.java

@@ -271,7 +271,7 @@ public class RankStrategy4RegionMergeModelV5 extends RankService {
                 JSONObject obj = new JSONObject();
                 obj.put("name", "user_key_in_model_is_null");
                 obj.put("class", this.CLASS_NAME);
-                log.info(obj.toString());
+//                log.info(obj.toString());
 //                return videos;
             }
         }
@@ -301,7 +301,7 @@ public class RankStrategy4RegionMergeModelV5 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
+//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -437,17 +437,17 @@ public class RankStrategy4RegionMergeModelV5 extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
+//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
 
 
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
+//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
         JSONObject obj = new JSONObject();
         obj.put("name", "user_key_in_model_is_not_null");
         obj.put("class", this.CLASS_NAME);
-        log.info(obj.toString());
+//        log.info(obj.toString());
         return rovRecallScore;
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV6.java

@@ -110,7 +110,6 @@ public class RankStrategy4RegionMergeModelV6 extends RankService {
 //            }
 //            Collections.sort(rovRecallRank, Comparator.comparingDouble(o -> -o.getSortScore()));
 //        }
-
         // 1 模型分
         List<String> rtFeaPart = new ArrayList<>();
         List<RankItem> items = model(rovRecallRank, param, rtFeaPart);
@@ -313,7 +312,7 @@ public class RankStrategy4RegionMergeModelV6 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
+//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -449,13 +448,13 @@ public class RankStrategy4RegionMergeModelV6 extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
+//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
 
 
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
+//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
         JSONObject obj = new JSONObject();
         obj.put("name", "user_key_in_model_is_not_null");
         obj.put("class", this.CLASS_NAME);