From 665a2e1098fb52800ac7624d4a32dfeb6ce15151 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 10 十一月 2021 11:03:36 +0800
Subject: [PATCH] 1. 网格化均值计算逻辑完成
---
src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt b/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt
index 316fe93..6cc7b95 100644
--- a/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/dataprocess/AverageUtil.kt
@@ -6,21 +6,21 @@
* @param onTag 瀹氫箟鏁版嵁鏍囩鑾峰彇鍥炶皟鍑芥暟锛屽綋褰撳墠鏁版嵁鏍囩涓庝笂涓暟鎹爣绛句笉鍚屾椂锛屽嵆璁や负涓婁竴缁勬暟鎹负鍚屼竴缁勬暟鎹紝闇�姹傚嚭鍧囧��
* @param onAvg 瀹氫箟鍧囧�艰绠楁柟娉�
*/
-class AverageUtil<T : Any>(var onTag: (d: T) -> String, var onAvg: (list: List<T>) -> T) {
+class AverageUtil<T, K>(var onTag: (d: T) -> String, var onAvg: (list: List<T>) -> K) {
// 缂撳瓨鏈�鏂扮殑tag
private var lastTag: String? = null
// 涓存椂鏁版嵁缂撳瓨
private val dataSet = mutableListOf<T>()
// 杞崲缁撴灉
- private val result = mutableListOf<T>()
+ private val result = mutableListOf<K>()
/**
* 灏嗘暟鎹泦杞崲涓哄潎鍊兼暟鎹�
* @param list 鍘熷鏁版嵁
* @return 鍧囧�兼暟鎹�
*/
- fun avg(list: List<T>): List<T> {
+ fun avg(list: List<T>): List<K> {
// 鍒濆鍖栨墍鏈夊彉閲�
clear()
// 璁＄畻鍧囧��
--
Gitblit v1.9.3