| @@ -988,7 +988,8 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| ModelMetaVo modelMetaVo = JSON.parseObject(meta, ModelMetaVo.class); | ModelMetaVo modelMetaVo = JSON.parseObject(meta, ModelMetaVo.class); | ||||
| if (modelMetaVo.getParams() != null) { | if (modelMetaVo.getParams() != null) { | ||||
| HashMap<String, Object> params = modelMetaVo.getParams(); | HashMap<String, Object> params = modelMetaVo.getParams(); | ||||
| branch.putAll(params); | |||||
| branch.put("params", params); | |||||
| ArrayList<String> params_names = new ArrayList<>(); | ArrayList<String> params_names = new ArrayList<>(); | ||||
| for (String key : params.keySet()) { | for (String key : params.keySet()) { | ||||
| params_names.add(key); | params_names.add(key); | ||||
| @@ -999,10 +1000,20 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| HashMap<String, Object> metrics = modelMetaVo.getMetrics(); | HashMap<String, Object> metrics = modelMetaVo.getMetrics(); | ||||
| if (Constant.Type_Train.equals(type)) { | if (Constant.Type_Train.equals(type)) { | ||||
| Map<String, Object> trainMetrics = (Map<String, Object>) metrics.get(Constant.Type_Train); | Map<String, Object> trainMetrics = (Map<String, Object>) metrics.get(Constant.Type_Train); | ||||
| branch.putAll(trainMetrics); | |||||
| ArrayList<String> metrics_names = new ArrayList<>(); | |||||
| for (String key : trainMetrics.keySet()) { | |||||
| metrics_names.add(key); | |||||
| } | |||||
| branch.put("metrics_names", metrics_names); | |||||
| branch.put("metrics",trainMetrics); | |||||
| } else { | } else { | ||||
| Map<String, Object> evaluateMetrics = (Map<String, Object>) metrics.get(Constant.Type_Evaluate); | Map<String, Object> evaluateMetrics = (Map<String, Object>) metrics.get(Constant.Type_Evaluate); | ||||
| branch.putAll(evaluateMetrics); | |||||
| ArrayList<String> metrics_names = new ArrayList<>(); | |||||
| for (String key : evaluateMetrics.keySet()) { | |||||
| metrics_names.add(key); | |||||
| } | |||||
| branch.put("metrics_names", metrics_names); | |||||
| branch.put("metrics",evaluateMetrics); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||