Parcourir la source

修复缺失ros特征

jch il y a 3 mois
Parent
commit
baf07fcc62

+ 3 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV562.java

@@ -213,18 +213,21 @@ public class RankStrategy4RegionMergeModelV562 extends RankStrategy4RegionMergeM
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f5 = f3 * f4;
                     double f5 = f3 * f4;
+                    double f6 = ExtractorUtils.calDiv(returns, share);
 
 
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
+                    String key6 = tuple4.name + "_" + prefix2 + "_" + "ROS";
 
 
                     featureMap.put(key1, f1);
                     featureMap.put(key1, f1);
                     featureMap.put(key2, f2);
                     featureMap.put(key2, f2);
                     featureMap.put(key3, f3);
                     featureMap.put(key3, f3);
                     featureMap.put(key4, f4);
                     featureMap.put(key4, f4);
                     featureMap.put(key5, f5);
                     featureMap.put(key5, f5);
+                    featureMap.put(key6, f6);
                 }
                 }
             }
             }
 
 
@@ -310,7 +313,6 @@ public class RankStrategy4RegionMergeModelV562 extends RankStrategy4RegionMergeM
         }
         }
 
 
         // 3 连续值特征分桶
         // 3 连续值特征分桶
-        readBucketFile();
         Map<String, String> userFeatureMap = FeatureBucketUtils.bucketFeature("20241209_rov_bucket.txt", userFeatureMapDouble);
         Map<String, String> userFeatureMap = FeatureBucketUtils.bucketFeature("20241209_rov_bucket.txt", userFeatureMapDouble);
         Map<String, String> norUserFeatureMap = FeatureBucketUtils.bucketFeature("20241209_nor_bucket.txt", userFeatureMapDouble);
         Map<String, String> norUserFeatureMap = FeatureBucketUtils.bucketFeature("20241209_nor_bucket.txt", userFeatureMapDouble);
         for (RankItem item : rankItems) {
         for (RankItem item : rankItems) {

+ 3 - 0
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV564.java

@@ -213,18 +213,21 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f5 = f3 * f4;
                     double f5 = f3 * f4;
+                    double f6 = ExtractorUtils.calDiv(returns, share);
 
 
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
+                    String key6 = tuple4.name + "_" + prefix2 + "_" + "ROS";
 
 
                     featureMap.put(key1, f1);
                     featureMap.put(key1, f1);
                     featureMap.put(key2, f2);
                     featureMap.put(key2, f2);
                     featureMap.put(key3, f3);
                     featureMap.put(key3, f3);
                     featureMap.put(key4, f4);
                     featureMap.put(key4, f4);
                     featureMap.put(key5, f5);
                     featureMap.put(key5, f5);
+                    featureMap.put(key6, f6);
                 }
                 }
             }
             }
 
 

+ 3 - 0
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV567.java

@@ -225,18 +225,21 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f5 = f3 * f4;
                     double f5 = f3 * f4;
+                    double f6 = ExtractorUtils.calDiv(returns, share);
 
 
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
+                    String key6 = tuple4.name + "_" + prefix2 + "_" + "ROS";
 
 
                     featureMap.put(key1, f1);
                     featureMap.put(key1, f1);
                     featureMap.put(key2, f2);
                     featureMap.put(key2, f2);
                     featureMap.put(key3, f3);
                     featureMap.put(key3, f3);
                     featureMap.put(key4, f4);
                     featureMap.put(key4, f4);
                     featureMap.put(key5, f5);
                     featureMap.put(key5, f5);
+                    featureMap.put(key6, f6);
                 }
                 }
             }
             }
 
 

+ 3 - 1
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV569.java

@@ -213,18 +213,21 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f3 = ExtractorUtils.calDiv(returns, exp);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f4 = ExtractorUtils.calLog(returns);
                     double f5 = f3 * f4;
                     double f5 = f3 * f4;
+                    double f6 = ExtractorUtils.calDiv(returns, share);
 
 
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key1 = tuple4.name + "_" + prefix2 + "_" + "STR";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key2 = tuple4.name + "_" + prefix2 + "_" + "log(share)";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key3 = tuple4.name + "_" + prefix2 + "_" + "ROV";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key4 = tuple4.name + "_" + prefix2 + "_" + "log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
                     String key5 = tuple4.name + "_" + prefix2 + "_" + "ROV*log(return)";
+                    String key6 = tuple4.name + "_" + prefix2 + "_" + "ROS";
 
 
                     featureMap.put(key1, f1);
                     featureMap.put(key1, f1);
                     featureMap.put(key2, f2);
                     featureMap.put(key2, f2);
                     featureMap.put(key3, f3);
                     featureMap.put(key3, f3);
                     featureMap.put(key4, f4);
                     featureMap.put(key4, f4);
                     featureMap.put(key5, f5);
                     featureMap.put(key5, f5);
+                    featureMap.put(key6, f6);
                 }
                 }
             }
             }
 
 
@@ -310,7 +313,6 @@ public class RankStrategy4RegionMergeModelV569 extends RankStrategy4RegionMergeM
         }
         }
 
 
         // 3 连续值特征分桶
         // 3 连续值特征分桶
-        readBucketFile();
         Map<String, String> userFeatureMap = FeatureBucketUtils.bucketFeature("20241209_rov_bucket.txt", userFeatureMapDouble);
         Map<String, String> userFeatureMap = FeatureBucketUtils.bucketFeature("20241209_rov_bucket.txt", userFeatureMapDouble);
         for (RankItem item : rankItems) {
         for (RankItem item : rankItems) {
             Map<String, Double> featureMapDouble = item.featureMapDouble;
             Map<String, Double> featureMapDouble = item.featureMapDouble;