From 52725f177acbe4ccf6b1fab059353890c4b55814 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 18 三月 2025 09:13:36 +0800 Subject: [PATCH] 样本构建修改 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java index 6bd9314..f5d23e7 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java @@ -140,19 +140,20 @@ ColumnItem columnItem = entry.getColumnItemList().get(i); dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(), columnItem.getGranularity()); - /** 如果数据取不满,把缺失的数据点放在后面 */ - if (dataEntityList != null && dataEntityList.size() != 0) { - logger.info("设置matrix, i = " + i + ", size = " + dataEntityList.size()); - // 调整值 - double adjustVal = SampleInfo.getAdjustValueFromDeviation(portIdx, i + 1, sampleInfo.getDeviation()); - for (int k = 0; k < dataEntityList.size(); k++) { - Double dataValue = dataEntityList.get(k).getDataValue(); - if (null != dataValue) { - // 用BigDecimal计算,解决double精度问题 - matrix[k][i] = BigDecimal.valueOf(dataValue).add(BigDecimal.valueOf(adjustVal)).doubleValue(); - } + if (CollectionUtils.isEmpty(dataEntityList)) { + continue; + } + logger.info("设置matrix, i = " + i + ", size = " + dataEntityList.size()); + // 调整值 + double adjustVal = SampleInfo.getAdjustValueFromDeviation(portIdx, i + 1, sampleInfo.getDeviation()); + for (int k = 0; k < dataEntityList.size(); k++) { + Double dataValue = dataEntityList.get(k).getDataValue(); + if (null == dataValue) { + continue; } + // 用BigDecimal计算,解决double精度问题 + matrix[k][i] = BigDecimal.valueOf(dataValue).add(BigDecimal.valueOf(adjustVal)).doubleValue(); } } catch (Exception e) { e.printStackTrace(); @@ -202,7 +203,6 @@ case NORMALITEM: case MERGEITEM: List<DataValueVO> predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime()); - if (CollectionUtils.isEmpty(predictValue)) { break; } -- Gitblit v1.9.3