From 82e98b24e0871366a5fc8bddab07bbabfc321eb3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 17 三月 2025 14:54:29 +0800
Subject: [PATCH] 构造样本优化
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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..b08e5a7 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();
@@ -201,8 +202,12 @@
break;
case NORMALITEM:
case MERGEITEM:
- List<DataValueVO> predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
-
+ List<DataValueVO> predictValue = new ArrayList<>();
+ if (columnItem.getStartTime().getTime() == columnItem.getEndTime().getTime()) {
+ predictValue = mmItemResultService.getPredictValueLast(columnItem.getParamId(), columnItem.getStartTime(), 2);
+ } else {
+ predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
+ }
if (CollectionUtils.isEmpty(predictValue)) {
break;
}
--
Gitblit v1.9.3