| | |
| | | |
| | | val range = FactorType.getRange(a.factorName) ?: return@v |
| | | // 判断数据是否在合理范围内 |
| | | if (a.factorData ?: 0.0 < range.first || a.factorData ?: 0.0 > range.second) { |
| | | if (a.factorData != null && (a.factorData!! < range.first || a.factorData!! > range.second)) { |
| | | a.factorData = null |
| | | } |
| | | } |
| | |
| | | if (lastData.isNotEmpty() && newList.isNotEmpty()) { |
| | | val lastTime = DateUtil.instance.StringToDate(lastData.last().time) |
| | | val thisTime = DateUtil.instance.StringToDate(newList.first().time) |
| | | if (thisTime?.time?.minus(lastTime?.time ?: 0) ?: 0 >= (60 * 1000)) { |
| | | if ((thisTime?.time?.minus(lastTime?.time ?: 0) ?: 0) >= (60 * 1000)) { |
| | | lastData.clear() |
| | | } |
| | | } |
| | |
| | | val f = it.values?.get(i) |
| | | if (f?.factorName == factorName) { |
| | | val range = FactorType.getRange(f?.factorName) ?: continue |
| | | if (f?.factorData ?: 0.0 in range.first..range.second) { |
| | | if ((f?.factorData ?: 0.0) in range.first..range.second) { |
| | | t += (f?.factorData!! - avg) * (f.factorData!! - avg) |
| | | c++ |
| | | } |