From a709abfd8ffec1524cefff30c3581f4425695433 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 05 十二月 2024 17:05:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index f59556b..3d53588 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -46,14 +46,14 @@
* @param predictTime
* @return
*/
- public SampleInfo prepareSampleInfo(String modelId, Date predictTime) {
+ protected SampleInfo prepareSampleInfo(String modelId, Date predictTime) {
SampleInfo sampleInfo = new SampleInfo();
//调用样本列数的方法
- sampleInfo.setSampleColumn(getSampleColumn(modelId));
+// sampleInfo.setSampleColumn(getSampleColumn(modelId));
//样本的列信息
sampleInfo.setColumnInfo(getColumnInfo(modelId, predictTime));
//样本的采样周期
- sampleInfo.setSampleCycle(getSampleCycle(modelId));
+// sampleInfo.setSampleCycle(getSampleCycle(modelId));
return sampleInfo;
}
@@ -64,6 +64,24 @@
* @return
*/
protected abstract Integer getSampleColumn(String modelId);
+
+
+ /**
+ * 样本的列信息
+ *
+ * @param modelId
+ * @param predictTime
+ * @return
+ */
+ protected abstract List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime);
+
+ /**
+ * 样本的采样周期
+ *
+ * @param modelId
+ * @return
+ */
+ protected abstract Integer getSampleCycle(String modelId);
/**
* 获取开始时间
@@ -176,23 +194,6 @@
}
return granularity;
}
-
- /**
- * 样本的列信息
- *
- * @param modelId
- * @param predictTime
- * @return
- */
- protected abstract List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime);
-
- /**
- * 样本的采样周期
- *
- * @param modelId
- * @return
- */
- protected abstract Integer getSampleCycle(String modelId);
/**
* 计算取值的时间
--
Gitblit v1.9.3