Merge pull request 'ModelType enum G4 추가' (#180) from feat/training_260324 into develop

Reviewed-on: #180

src/main/java/com/kamco/cd/training/common/enums/ModelType.java

@@ -12,7 +12,8 @@ import lombok.Getter;
 public enum ModelType implements EnumType {
   G1("G1"),
   G2("G2"),
-  G3("G3");
+  G3("G3"),
+  G4("G4");
 
   private String desc;
 

src/main/java/com/kamco/cd/training/model/service/ModelTrainMngService.java

@@ -51,10 +51,10 @@ public class ModelTrainMngService {
 
   @Value("${train.docker.response_dir}")
   private String responseDir;
+
   @Value("${train.docker.symbolic_link_dir}")
   private String symbolicDir;
 
-
   /**
    * 모델학습 조회
    *

src/main/java/com/kamco/cd/training/train/service/DockerTrainService.java

@@ -262,9 +262,9 @@ public class DockerTrainService {
     c.add("-v");
     c.add(basePath + ":" + basePath); // 심볼릭 링크와 연결되는 실제 파일 경로도 마운트를 해줘야 함
     c.add("-v");
-    c.add(symbolicDir + ":/data");    //요청할경로
+    c.add(symbolicDir + ":/data"); // 요청할경로
     c.add("-v");
-    c.add(responseDir + ":/checkpoints"); //저장될경로
+    c.add(responseDir + ":/checkpoints"); // 저장될경로
 
     // 표준입력 유지 (-it 대신 -i만 사용)
     c.add("-i");

src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java

@@ -85,34 +85,20 @@ public class ModelTrainMetricsJobService {
 
           int epoch = Integer.parseInt(record.get("Epoch"));
 
-          float aAcc = parseFloatSafe(record.get("aAcc"));
-          float mFscore = parseFloatSafe(record.get("mFscore"));
-          float mPrecision = parseFloatSafe(record.get("mPrecision"));
-          float mRecall = parseFloatSafe(record.get("mRecall"));
-          float mIoU = parseFloatSafe(record.get("mIoU"));
-          float mAcc = parseFloatSafe(record.get("mAcc"));
+          Float aAcc = parseFloatSafe(record.get("aAcc"));
+          Float mFscore = parseFloatSafe(record.get("mFscore"));
+          Float mPrecision = parseFloatSafe(record.get("mPrecision"));
+          Float mRecall = parseFloatSafe(record.get("mRecall"));
+          Float mIoU = parseFloatSafe(record.get("mIoU"));
+          Float mAcc = parseFloatSafe(record.get("mAcc"));
 
-          float changed_fscore = parseFloatSafe(record.get("changed_fscore"));
-          float changed_precision = parseFloatSafe(record.get("changed_precision"));
-          float changed_recall = parseFloatSafe(record.get("changed_recall"));
+          Float changed_fscore = parseFloatSafe(record.get("changed_fscore"));
+          Float changed_precision = parseFloatSafe(record.get("changed_precision"));
+          Float changed_recall = parseFloatSafe(record.get("changed_recall"));
 
-          float unchanged_fscore = parseFloatSafe(record.get("unchanged_fscore"));
-          float unchanged_precision = parseFloatSafe(record.get("unchanged_precision"));
-          float unchanged_recall = parseFloatSafe(record.get("unchanged_recall"));
-          //          int epoch = Integer.parseInt(record.get("Epoch"));
-          //          float aAcc = Float.parseFloat(record.get("aAcc"));
-          //          float mFscore = Float.parseFloat(record.get("mFscore"));
-          //          float mPrecision = Float.parseFloat(record.get("mPrecision"));
-          //          float mRecall = Float.parseFloat(record.get("mRecall"));
-          //          float mIoU = Float.parseFloat(record.get("mIoU"));
-          //          float mAcc = Float.parseFloat(record.get("mAcc"));
-          //          float changed_fscore = Float.parseFloat(record.get("changed_fscore"));
-          //          float changed_precision = Float.parseFloat(record.get("changed_precision"));
-          //          float changed_recall = Float.parseFloat(record.get("changed_recall"));
-          //          float unchanged_fscore = Float.parseFloat(record.get("unchanged_fscore"));
-          //          float unchanged_precision =
-          // Float.parseFloat(record.get("unchanged_precision"));
-          //          float unchanged_recall = Float.parseFloat(record.get("unchanged_recall"));
+          Float unchanged_fscore = parseFloatSafe(record.get("unchanged_fscore"));
+          Float unchanged_precision = parseFloatSafe(record.get("unchanged_precision"));
+          Float unchanged_recall = parseFloatSafe(record.get("unchanged_recall"));
 
           batchArgs.add(
               new Object[] {

src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java

@@ -19,6 +19,7 @@ public class TmpDatasetService {
 
   @Value("${train.docker.symbolic_link_dir}")
   private String symbolicDir;
+
   /**
    * train, val, test 폴더별로 link
    *