From 142bcd3bd15e9ba6176bb2093eee22040da9bd8c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 03 三月 2025 16:08:44 +0800
Subject: [PATCH] 保留3位小数
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 30 +++++++++++++++++-------------
1 files changed, 17 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 c7792e8..9968c29 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
@@ -89,8 +89,7 @@
}
}
- int deviationIndex = 0;
-
+ int portIdx = 0;
//对每个爪分别进行计算
for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
double[][] matrix = new double[0][0];
@@ -107,7 +106,7 @@
if (!CollectionUtils.isEmpty(indItemValueList)) {
matrix = new double[entry.getDataLength()][0];
if (indItemValueList.size() > entry.getDataLength()) {
- indItemValueList = indItemValueList.subList(0,entry.getDataLength());
+ indItemValueList = indItemValueList.subList(0, entry.getDataLength());
}
for (int i = 0; i < indItemValueList.size(); i++) {
String stringValue = indItemValueList.get(i).getDataValue().toString();
@@ -115,7 +114,7 @@
matrix[i] = asciiArray;
}
}
- }else {
+ } else {
//先依据爪内数据项的modelParamOrder进行排序——重写comparator匿名函数
Collections.sort(entry.getColumnItemList(), new Comparator<ColumnItem>() {
@Override
@@ -132,20 +131,23 @@
}
}
- //找出对应的调整值
- double[] deviationItem = null;
- if (sampleInfo.getDeviation() != null && sampleInfo.getDeviation().length > 0) {
- deviationItem = sampleInfo.getDeviation()[deviationIndex];
- }
- deviationIndex ++;
-
//对每一项依次进行数据查询,然后将查询出的值赋给matrix对应的位置
for (int i = 0; i < entry.getColumnItemList().size(); i++) {
try {
- List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap,indMap);
+ List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap, indMap);
+
+ double adjustVal = SampleInfo.getAdjustValueFromDeviation(portIdx, i, sampleInfo.getDeviation());
+ if (adjustVal != 0) {
+ logger.info("设置调整值adjustVal:" + adjustVal);
+ for (int dataKey = 1; dataKey < dataEntityList.size(); dataKey++) {
+ DataValueVO item = dataEntityList.get(dataKey);
+ item.setDataValue(item.getDataValue() + adjustVal);
+ }
+ }
+
//补全数据
ColumnItem columnItem = entry.getColumnItemList().get(i);
- dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(),columnItem.getGranularity());
+ dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(), columnItem.getGranularity());
/** 如果数据取不满，把缺失的数据点放在后面 */
if (dataEntityList != null && dataEntityList.size() != 0) {
@@ -162,6 +164,8 @@
throw e;
}
}
+
+ portIdx++;
}
SampleData sampleData = new SampleData();
sampleData.setMatrix(matrix);
--
Gitblit v1.9.3