diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index 06973e08..5efe94d3 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -1137,24 +1137,33 @@ public class ModelsServiceImpl implements ModelsService { void getMetrics(ModelMetaVo modelMetaVo) throws Exception { HashMap result = new HashMap<>(); + HashMap train = new HashMap<>(); + HashMap evaluate = new HashMap<>(); + HashMap metrics = modelMetaVo.getMetrics(); 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 expTrainInfos = aimsService.getExpTrainInfos(modelMetaVo.getTrainTask().getExperimentId(), runId); - System.out.print(expTrainInfos); - for (InsMetricInfoVo expTrainInfo :expTrainInfos) { + for (InsMetricInfoVo expTrainInfo : expTrainInfos) { Map metrics1 = expTrainInfo.getMetrics(); + train.putAll(metrics1); } } + result.put("train", train); 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 expTestInfos = aimsService.getExpEvaluateInfos(modelMetaVo.getTrainTask().getExperimentId(), runId); - System.out.print(expTestInfos); + for (InsMetricInfoVo expTestInfo : expTestInfos) { + Map metrics1 = expTestInfo.getMetrics(); + evaluate.putAll(metrics1); + } } + result.put("evaluate", evaluate); + modelMetaVo.setMetrics(result); } }