diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDatasetMappRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDatasetMappRepositoryImpl.java index af1c028..f06ebdd 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDatasetMappRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDatasetMappRepositoryImpl.java @@ -48,6 +48,7 @@ public class ModelDatasetMappRepositoryImpl implements ModelDatasetMappRepositor datasetObjEntity.comparePath, datasetObjEntity.targetPath, datasetObjEntity.labelPath, + datasetObjEntity.geojsonPath, datasetEntity.uid)) .from(modelMasterEntity) .leftJoin(modelDatasetMappEntity) @@ -91,6 +92,7 @@ public class ModelDatasetMappRepositoryImpl implements ModelDatasetMappRepositor datasetValObjEntity.comparePath, datasetValObjEntity.targetPath, datasetValObjEntity.labelPath, + datasetValObjEntity.geojsonPath, datasetEntity.uid)) .from(modelMasterEntity) .leftJoin(modelDatasetMappEntity) @@ -134,6 +136,7 @@ public class ModelDatasetMappRepositoryImpl implements ModelDatasetMappRepositor datasetTestObjEntity.comparePath, datasetTestObjEntity.targetPath, datasetTestObjEntity.labelPath, + datasetTestObjEntity.geojsonPath, datasetEntity.uid)) .from(modelMasterEntity) .leftJoin(modelDatasetMappEntity) diff --git a/src/main/java/com/kamco/cd/training/train/dto/ModelTrainLinkDto.java b/src/main/java/com/kamco/cd/training/train/dto/ModelTrainLinkDto.java index 19043f1..58a6faa 100644 --- a/src/main/java/com/kamco/cd/training/train/dto/ModelTrainLinkDto.java +++ b/src/main/java/com/kamco/cd/training/train/dto/ModelTrainLinkDto.java @@ -19,5 +19,6 @@ public class ModelTrainLinkDto { private String comparePath; private String targetPath; private String labelPath; + private String geoJsonPath; private String datasetUid; } diff --git a/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java b/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java index 6c7049c..5208172 100644 --- a/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java +++ b/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java @@ -51,6 +51,7 @@ public class TmpDatasetService { Files.createDirectories(tmp.resolve(type).resolve("input1")); Files.createDirectories(tmp.resolve(type).resolve("input2")); Files.createDirectories(tmp.resolve(type).resolve("label")); + Files.createDirectories(tmp.resolve(type).resolve("label-json")); // comparePath → input1 hardlinksMade += link(tmp, type, "input1", dto.getComparePath()); @@ -60,6 +61,9 @@ public class TmpDatasetService { // labelPath → label hardlinksMade += link(tmp, type, "label", dto.getLabelPath()); + + // geoJsonPath -> label-json + hardlinksMade += link(tmp, type, "label-json", dto.getGeoJsonPath()); } if (hardlinksMade == 0) { @@ -124,7 +128,7 @@ public class TmpDatasetService { // tmp 디렉토리 준비 for (String type : List.of("train", "val", "test")) { - for (String part : List.of("input1", "input2", "label")) { + for (String part : List.of("input1", "input2", "label", "label-json")) { Path dir = tmp.resolve(type).resolve(part); Files.createDirectories(dir); log.info("createDirectories: {}", dir); @@ -157,7 +161,7 @@ public class TmpDatasetService { log.info("---- dataset id={} srcRoot={} exists? {}", id, srcRoot, Files.isDirectory(srcRoot)); for (String type : List.of("train", "val", "test")) { - for (String part : List.of("input1", "input2", "label")) { + for (String part : List.of("input1", "input2", "label", "label-json")) { Path srcDir = srcRoot.resolve(type).resolve(part); if (!Files.isDirectory(srcDir)) {