| 
					
				 | 
			
			
				@@ -21,14 +21,14 @@ public class FeatureV6 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> b2Periods = Arrays.asList("1h", "3h", "24h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> b3Periods = Arrays.asList("24h", "72h", "168h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> b4Periods = Arrays.asList("1h", "3h", "6h", "12h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private static final List<String> b5Periods = Arrays.asList("1h", "3h", "6h", "12h", "24h", "72h", "168h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private static final List<String> b5Periods = Arrays.asList("1h", "3h", "6h", "12h", "24h", "72h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> b6Periods = Arrays.asList("1h", "24h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private static final List<String> b7Periods = Arrays.asList("1h", "3h", "24h", "72h", "168h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private static final List<String> b7Periods = Arrays.asList("1h", "3h", "6h", "12h", "24h", "72h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> b8Periods = Arrays.asList("1h", "3h", "24h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> b9Periods = Arrays.asList("1h", "3h", "24h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> b10Periods = Arrays.asList("1h", "12h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private static final List<String> b11Periods = Arrays.asList("12h", "168h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private static final List<String> b13Periods = Arrays.asList("1h", "3h", "24h", "72h", "168h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private static final List<String> b11Periods = Arrays.asList("1h", "12h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private static final List<String> b13Periods = Arrays.asList("1h", "3h", "24h", "72h"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> videoCateAttrs = Arrays.asList(FeatureUtils.cate1Attr, FeatureUtils.cate2Attr, FeatureUtils.festive1Attr, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             FeatureUtils.channelAttr, FeatureUtils.sourceAttr, FeatureUtils.uidAttr, FeatureUtils.mergeCate1Attr, FeatureUtils.mergeCate2Attr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private static final List<String> videoSimAttrs = Arrays.asList("title", "cate2", "cate2_list", "keywords"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -86,6 +86,8 @@ public class FeatureV6 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 double ros_one = FeatureUtils.wilsonScore(r_pv, s_pv); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 double ros = FeatureUtils.plusSmooth(r_uv, s_pv, smoothPlus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 double ros_minus = FeatureUtils.plusSmooth(r_uv, r_pv, smoothPlus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                double l_ros = FeatureUtils.plusSmooth(r_uv / 5.0, s_pv, largerSmoothPlus, 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                double l_ros_minus = FeatureUtils.plusSmooth(r_uv / 5.0, r_pv, largerSmoothPlus, 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 featMap.put("c9@s_pv", s_pv_s); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 featMap.put("c9@s_cnt", s_cnt_s); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 featMap.put("c9@r_pv", r_pv_s); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -95,6 +97,8 @@ public class FeatureV6 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 featMap.put("c9@ros_one", ros_one); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 featMap.put("c9@ros", ros); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 featMap.put("c9@ros_minus", ros_minus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                featMap.put("c9@ros_#", l_ros); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                featMap.put("c9@ros_minus_#", l_ros_minus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (null != userInfo && !userInfo.isEmpty()) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -289,6 +293,8 @@ public class FeatureV6 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     double ros_one = FeatureUtils.wilsonScore(rp, sp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     double ros = FeatureUtils.plusSmooth(ru, sp, smoothPlus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     double ros_minus = FeatureUtils.plusSmooth(ru, rp, smoothPlus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    double l_ros = FeatureUtils.plusSmooth(ru / 5.0, sp, largerSmoothPlus, 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    double l_ros_minus = FeatureUtils.plusSmooth(ru / 5.0, rp, largerSmoothPlus, 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     featMap.put(prefix + "@sp", sp_s); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     featMap.put(prefix + "@rp", rp_s); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -297,6 +303,8 @@ public class FeatureV6 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     featMap.put(prefix + "@ros_one", ros_one); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     featMap.put(prefix + "@ros", ros); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     featMap.put(prefix + "@ros_minus", ros_minus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    featMap.put(prefix + "@ros_#", l_ros); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    featMap.put(prefix + "@ros_minus_#", l_ros_minus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 |