|  | @@ -24,6 +24,7 @@ object makedata_recsys_61_nor_sample_20241209 {
 | 
											
												
													
														|  |      val whatLabel = param.getOrElse("whatLabel", "total_return_uv_new")
 |  |      val whatLabel = param.getOrElse("whatLabel", "total_return_uv_new")
 | 
											
												
													
														|  |      val whatApps = param.getOrElse("whatApps", "0,4,5,21,3,6").split(",").toSet
 |  |      val whatApps = param.getOrElse("whatApps", "0,4,5,21,3,6").split(",").toSet
 | 
											
												
													
														|  |      val fuSampleRate = param.getOrElse("fuSampleRate", "-1.0").toDouble
 |  |      val fuSampleRate = param.getOrElse("fuSampleRate", "-1.0").toDouble
 | 
											
												
													
														|  | 
 |  | +    val notUseBucket = param.getOrElse("notUseBucket", "0").toInt
 | 
											
												
													
														|  |      val featureNameFile = param.getOrElse("featureName", "20241209_recsys_nor_name.txt")
 |  |      val featureNameFile = param.getOrElse("featureName", "20241209_recsys_nor_name.txt")
 | 
											
												
													
														|  |      val featureBucketFile = param.getOrElse("featureBucket", "20241209_recsys_nor_bucket.txt")
 |  |      val featureBucketFile = param.getOrElse("featureBucket", "20241209_recsys_nor_bucket.txt")
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -35,7 +36,7 @@ object makedata_recsys_61_nor_sample_20241209 {
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      val loader = getClass.getClassLoader
 |  |      val loader = getClass.getClassLoader
 | 
											
												
													
														|  |      val featureNameSet = loadUseFeatureNames(loader, featureNameFile)
 |  |      val featureNameSet = loadUseFeatureNames(loader, featureNameFile)
 | 
											
												
													
														|  | -    val featureBucketMap = loadUseFeatureBuckets(loader, featureBucketFile)
 |  | 
 | 
											
												
													
														|  | 
 |  | +    val featureBucketMap = loadUseFeatureBuckets(loader, notUseBucket, featureBucketFile)
 | 
											
												
													
														|  |      val bucketsMap_br = sc.broadcast(featureBucketMap)
 |  |      val bucketsMap_br = sc.broadcast(featureBucketMap)
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      val dateRange = MyDateUtils.getDateRange(beginStr, endStr)
 |  |      val dateRange = MyDateUtils.getDateRange(beginStr, endStr)
 | 
											
										
											
												
													
														|  | @@ -131,7 +132,10 @@ object makedata_recsys_61_nor_sample_20241209 {
 | 
											
												
													
														|  |        .toSet
 |  |        .toSet
 | 
											
												
													
														|  |    }
 |  |    }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -  private def loadUseFeatureBuckets(loader: ClassLoader, nameFile: String): Map[String, (Double, Array[Double])] = {
 |  | 
 | 
											
												
													
														|  | 
 |  | +  private def loadUseFeatureBuckets(loader: ClassLoader, notUseBucket: Int, nameFile: String): Map[String, (Double, Array[Double])] = {
 | 
											
												
													
														|  | 
 |  | +    if (notUseBucket > 0) {
 | 
											
												
													
														|  | 
 |  | +      return Map[String, (Double, Array[Double])]()
 | 
											
												
													
														|  | 
 |  | +    }
 | 
											
												
													
														|  |      val buckets = loadFileData(loader, nameFile)
 |  |      val buckets = loadFileData(loader, nameFile)
 | 
											
												
													
														|  |      println(buckets)
 |  |      println(buckets)
 | 
											
												
													
														|  |      buckets.split("\n")
 |  |      buckets.split("\n")
 |