Bladeren bron

feature domain

丁云鹏 1 jaar geleden
bovenliggende
commit
27f903f656
15 gewijzigde bestanden met toevoegingen van 27 en 27 verwijderingen
  1. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/common/base/RankItem.java
  2. 4 4
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/FeatureConstructor.java
  3. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/ItemFeatureToRedisLoader.java
  4. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/OfflineAdOutSamplesLoader.java
  5. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/UserFeatureToRedisLoader.java
  6. 3 3
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/remote/FeatureRemoteService.java
  7. 3 3
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankService.java
  8. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/AbstractScorer.java
  9. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/ScoreParam.java
  10. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/ScorerPipeline.java
  11. 2 2
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/VlogShareGBDTScorer.java
  12. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/VlogShareLRScorer.java
  13. 1 1
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/feature/GBDTFeatureExtractorBase.java
  14. 3 3
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/feature/LRBytesFeatureExtractorBase.java
  15. 3 3
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/feature/VlogShareLRFeatureExtractor.java

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/common/base/RankItem.java

@@ -1,6 +1,6 @@
 package com.tzld.piaoquan.recommend.server.common.base;
 
-import com.tzld.piaoquan.recommend.feature.domain.ItemFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.ItemFeature;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import lombok.Data;
 

+ 4 - 4
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/FeatureConstructor.java

@@ -3,10 +3,10 @@ package com.tzld.piaoquan.recommend.server.dataloader;
 
 import com.aliyun.odps.tunnel.InstanceTunnel;
 import com.aliyun.odps.tunnel.io.TunnelRecordReader;
-import com.tzld.piaoquan.recommend.feature.domain.ItemFeature;
-import com.tzld.piaoquan.recommend.feature.domain.RequestContext;
-import com.tzld.piaoquan.recommend.feature.domain.UserActionFeature;
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.ItemFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.RequestContext;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserActionFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import com.aliyun.odps.Instance;
 import com.aliyun.odps.Odps;
 import com.aliyun.odps.OdpsException;

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/ItemFeatureToRedisLoader.java

@@ -2,7 +2,7 @@ package com.tzld.piaoquan.recommend.server.dataloader;
 
 import com.aliyun.odps.data.Record;
 import com.aliyun.odps.tunnel.io.TunnelRecordReader;
-import com.tzld.piaoquan.recommend.feature.domain.ItemFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.ItemFeature;
 import com.tzld.piaoquan.recommend.server.common.ThreadPoolFactory;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/OfflineAdOutSamplesLoader.java

@@ -2,7 +2,7 @@ package com.tzld.piaoquan.recommend.server.dataloader;
 
 import com.aliyun.odps.tunnel.io.TunnelRecordReader;
 import com.google.common.collect.ListMultimap;
-import com.tzld.piaoquan.recommend.feature.domain.*;
+import com.tzld.piaoquan.recommend.feature.domain.video.*;
 import com.tzld.piaoquan.recommend.server.gen.recommend.BaseFeature;
 import com.tzld.piaoquan.recommend.server.gen.recommend.FeatureGroup;
 import com.tzld.piaoquan.recommend.server.service.score.feature.VlogShareLRFeatureExtractor;

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/dataloader/UserFeatureToRedisLoader.java

@@ -2,7 +2,7 @@ package com.tzld.piaoquan.recommend.server.dataloader;
 
 import com.aliyun.odps.data.Record;
 import com.aliyun.odps.tunnel.io.TunnelRecordReader;
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import com.tzld.piaoquan.recommend.server.common.ThreadPoolFactory;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;

+ 3 - 3
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/remote/FeatureRemoteService.java

@@ -4,9 +4,9 @@ import com.tzld.piaoquan.recommend.feature.client.FeatureClient;
 import com.tzld.piaoquan.recommend.feature.model.feature.UserActionFeatureProto;
 import com.tzld.piaoquan.recommend.feature.model.feature.UserFeatureProto;
 import com.tzld.piaoquan.recommend.feature.model.feature.VideoFeatureProto;
-import com.tzld.piaoquan.recommend.feature.domain.ItemFeature;
-import com.tzld.piaoquan.recommend.feature.domain.UserActionFeature;
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.ItemFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserActionFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import com.tzld.piaoquan.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

+ 3 - 3
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankService.java

@@ -1,10 +1,10 @@
 package com.tzld.piaoquan.recommend.server.service.rank;
 
 
-import com.tzld.piaoquan.recommend.feature.domain.ItemFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.ItemFeature;
 import com.tzld.piaoquan.recommend.server.common.base.RankItem;
-import com.tzld.piaoquan.recommend.feature.domain.RequestContext;
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.RequestContext;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import com.tzld.piaoquan.recommend.server.common.enums.AppTypeEnum;
 import com.tzld.piaoquan.recommend.server.model.MachineInfo;
 import com.tzld.piaoquan.recommend.server.model.Video;

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/AbstractScorer.java

@@ -2,7 +2,7 @@ package com.tzld.piaoquan.recommend.server.service.score;
 
 
 import com.tzld.piaoquan.recommend.server.common.base.RankItem;
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import com.tzld.piaoquan.recommend.server.service.score.model.Model;
 import com.tzld.piaoquan.recommend.server.service.score.model.ModelManager;
 import org.apache.commons.lang3.StringUtils;

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/ScoreParam.java

@@ -1,6 +1,6 @@
 package com.tzld.piaoquan.recommend.server.service.score;
 
-import com.tzld.piaoquan.recommend.feature.domain.RequestContext;
+import com.tzld.piaoquan.recommend.feature.domain.video.RequestContext;
 import lombok.Data;
 
 /**

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/ScorerPipeline.java

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.score;
 
 import com.tzld.piaoquan.recommend.server.common.base.RankItem;
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;

+ 2 - 2
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/VlogShareGBDTScorer.java

@@ -2,8 +2,8 @@ package com.tzld.piaoquan.recommend.server.service.score;
 
 
 import com.tzld.piaoquan.recommend.server.common.base.RankItem;
-import com.tzld.piaoquan.recommend.feature.domain.RequestContext;
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.RequestContext;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest;
 import com.tzld.piaoquan.recommend.server.service.score.feature.GBDTFeatureExtractorBase;
 import com.tzld.piaoquan.recommend.server.service.score.model.GBDTModel;

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/VlogShareLRScorer.java

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.score;
 
 
-import com.tzld.piaoquan.recommend.feature.domain.*;
+import com.tzld.piaoquan.recommend.feature.domain.video.*;
 import com.tzld.piaoquan.recommend.server.common.base.*;
 import com.tzld.piaoquan.recommend.server.gen.recommend.LRSamples;
 import com.tzld.piaoquan.recommend.server.service.score.feature.VlogShareLRFeatureExtractor;

+ 1 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/feature/GBDTFeatureExtractorBase.java

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.score.feature;
 
 
-import com.tzld.piaoquan.recommend.feature.domain.UserFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserFeature;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallResult;
 import com.tzld.piaoquan.recommend.server.service.score.ScoreParam;
 import org.slf4j.Logger;

+ 3 - 3
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/feature/LRBytesFeatureExtractorBase.java

@@ -3,9 +3,9 @@ package com.tzld.piaoquan.recommend.server.service.score.feature;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 
-import com.tzld.piaoquan.recommend.feature.domain.RequestContextBytesFeature;
-import com.tzld.piaoquan.recommend.feature.domain.UserBytesFeature;
-import com.tzld.piaoquan.recommend.feature.domain.VideoBytesFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.RequestContextBytesFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserBytesFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.VideoBytesFeature;
 import com.tzld.piaoquan.recommend.server.common.enums.VlogFeatureGroup;
 import com.tzld.piaoquan.recommend.server.gen.recommend.LRSamples;
 import com.tzld.piaoquan.recommend.server.gen.recommend.BaseFeature;

+ 3 - 3
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/feature/VlogShareLRFeatureExtractor.java

@@ -1,8 +1,8 @@
 package com.tzld.piaoquan.recommend.server.service.score.feature;
 
-import com.tzld.piaoquan.recommend.feature.domain.RequestContextBytesFeature;
-import com.tzld.piaoquan.recommend.feature.domain.UserBytesFeature;
-import com.tzld.piaoquan.recommend.feature.domain.VideoBytesFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.RequestContextBytesFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.UserBytesFeature;
+import com.tzld.piaoquan.recommend.feature.domain.video.VideoBytesFeature;
 import com.tzld.piaoquan.recommend.server.common.enums.VlogFeatureGroup;
 import com.tzld.piaoquan.recommend.server.gen.recommend.*;