| @@ -1162,28 +1162,32 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| HashMap<String, Object> metrics = modelMetaVo.getMetrics(); | HashMap<String, Object> metrics = modelMetaVo.getMetrics(); | ||||
| JSONArray trainMetrics = (JSONArray) metrics.get("train"); | JSONArray trainMetrics = (JSONArray) metrics.get("train"); | ||||
| for (int i = 0; i < trainMetrics.size(); i++) { | |||||
| JSONObject jsonObject = trainMetrics.getJSONObject(i); | |||||
| String runId = jsonObject.getString("run_id"); | |||||
| List<InsMetricInfoVo> expTrainInfos = aimsService.getExpTrainInfos1(true, modelMetaVo.getTrainTask().getExperimentId(), runId); | |||||
| for (InsMetricInfoVo expTrainInfo : expTrainInfos) { | |||||
| Map metrics1 = expTrainInfo.getMetrics(); | |||||
| train.putAll(metrics1); | |||||
| if (trainMetrics != null) { | |||||
| for (int i = 0; i < trainMetrics.size(); i++) { | |||||
| JSONObject jsonObject = trainMetrics.getJSONObject(i); | |||||
| String runId = jsonObject.getString("run_id"); | |||||
| List<InsMetricInfoVo> expTrainInfos = aimsService.getExpTrainInfos1(true, modelMetaVo.getTrainTask().getExperimentId(), runId); | |||||
| for (InsMetricInfoVo expTrainInfo : expTrainInfos) { | |||||
| Map metrics1 = expTrainInfo.getMetrics(); | |||||
| train.putAll(metrics1); | |||||
| } | |||||
| } | } | ||||
| result.put("train", train); | |||||
| } | } | ||||
| result.put("train", train); | |||||
| JSONArray testMetrics = (JSONArray) metrics.get("evaluate"); | JSONArray testMetrics = (JSONArray) metrics.get("evaluate"); | ||||
| for (int i = 0; i < testMetrics.size(); i++) { | |||||
| JSONObject jsonObject = testMetrics.getJSONObject(i); | |||||
| String runId = jsonObject.getString("run_id"); | |||||
| List<InsMetricInfoVo> expTestInfos = aimsService.getExpTrainInfos1(false, modelMetaVo.getTrainTask().getExperimentId(), runId); | |||||
| for (InsMetricInfoVo expTestInfo : expTestInfos) { | |||||
| Map metrics1 = expTestInfo.getMetrics(); | |||||
| evaluate.putAll(metrics1); | |||||
| if (testMetrics != null) { | |||||
| for (int i = 0; i < testMetrics.size(); i++) { | |||||
| JSONObject jsonObject = testMetrics.getJSONObject(i); | |||||
| String runId = jsonObject.getString("run_id"); | |||||
| List<InsMetricInfoVo> expTestInfos = aimsService.getExpTrainInfos1(false, modelMetaVo.getTrainTask().getExperimentId(), runId); | |||||
| for (InsMetricInfoVo expTestInfo : expTestInfos) { | |||||
| Map metrics1 = expTestInfo.getMetrics(); | |||||
| evaluate.putAll(metrics1); | |||||
| } | |||||
| } | } | ||||
| result.put("evaluate", evaluate); | |||||
| } | } | ||||
| result.put("evaluate", evaluate); | |||||
| modelMetaVo.setMetrics(result); | modelMetaVo.setMetrics(result); | ||||
| } | } | ||||
| } | } | ||||