From cc2a28ad6b99795d05cd9c923d8f7da27b4509e3 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期三, 04 六月 2025 17:31:41 +0800 Subject: [PATCH] 1. 新增动态污染溯源新的判定逻辑(待完成) --- src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt index 1e08443..271388a 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/config/RTExcWindLevelConfig.kt @@ -13,7 +13,8 @@ inner class WindLevelCondition( val windSpeed: Pair<Double, Double>, - val mutationRate: Pair<Double, DistanceType>, + val mutationRate: Pair<Double, Double>, + val distanceType: DistanceType, val countLimit: Int, ) @@ -25,28 +26,33 @@ // 0 - 1绾ч var windLevelCondition1 = WindLevelCondition( .0 to 1.5, - 0.5 to DistanceType.TYPE1, + 0.5 to Double.MAX_VALUE, + DistanceType.TYPE1, 1 ) // 0 - 1绾ч var windLevelCondition1_1 = WindLevelCondition( .0 to 1.5, - 0.2 to DistanceType.TYPE2, + 0.2 to 0.5, + DistanceType.TYPE2, 1 ) // 2 - 4绾ч var windLevelCondition2 = WindLevelCondition( 1.6 to 7.9, - 0.2 to DistanceType.TYPE3, - 3 + 0.2 to Double.MAX_VALUE, + DistanceType.TYPE3, +// 3 + 1 ) // 5 - 6绾ч var windLevelCondition3 = WindLevelCondition( 8.0 to 13.8, - 0.1 to DistanceType.TYPE4, + 0.1 to Double.MAX_VALUE, + DistanceType.TYPE4, 3 ) @@ -56,5 +62,36 @@ // 瀹氭椂绾跨储鍒嗘瀽鏃堕棿闂撮殧(鍗曚綅锛氬垎閽�) var analysisPeriod = 15 // 瀹氭椂鍒嗘瀽闂撮殧涓紝绔嬪嵆杩涜绾跨储鍒嗘瀽鐨勬渶灏忕嚎绱㈤噺(鍗曚綅锛氫釜) - var analysisCount = 3 + var analysisCount = 2 + + + +// // 0 - 1绾ч +// var windLevelCondition1 = WindLevelCondition( +// .0 to 1.5, +// listOf(0.5 to DistanceType.TYPE1, 0.2 to DistanceType.TYPE2,), +// listOf(1, 1) +// ) +// +// // 0 - 1绾ч +// var windLevelCondition1_1 = WindLevelCondition( +// .0 to 1.5, +// 0.2 to DistanceType.TYPE2, +// 1 +// ) +// +// // 2 - 4绾ч +// var windLevelCondition2 = WindLevelCondition( +// 1.6 to 7.9, +// listOf(0.2 to DistanceType.TYPE3), +//// listOf(3) +// listOf(1) +// ) +// +// // 5 - 6绾ч +// var windLevelCondition3 = WindLevelCondition( +// 8.0 to 13.8, +// listOf(0.1 to DistanceType.TYPE4), +// listOf(3) +// ) } \ No newline at end of file -- Gitblit v1.9.3