diff --git a/config/disabledAlgorithms.json b/config/disabledAlgorithms.json index 9c832491dd58d85b95d955e421f9dc54a068671e..6fc4a5d46908e35054073bf92c767df531292cb7 100644 --- a/config/disabledAlgorithms.json +++ b/config/disabledAlgorithms.json @@ -1,3 +1,4 @@ [ - "THREE_C" + "THREE_C", + "KAPLAN_MEIER" ] \ No newline at end of file diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java index a9c20ff7b1ba48fa20e29316c042a78199613723..b5b990b3ba898272563939a6798c39d7e5fe6fa1 100644 --- a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java +++ b/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java @@ -63,7 +63,7 @@ public class ExaremeAlgorithmRequestParamDTO { this.defaultValue = parameter.getDefault_value(); this.valueNotBlank = parameter.getNotblank(); this.label = parameter.getLabel(); - this.valueEnumerations = parameter.getEnums(); + this.valueEnumerations = parameter.getEnums().isPresent()? parameter.getEnums().get().getSource():null; this.valueMultiple = parameter.getMultiple(); this.valueMax = parameter.getMax(); this.valueMin = parameter.getMin(); diff --git a/src/main/java/eu/hbp/mip/models/DTOs/MIPEngineAlgorithmDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/MIPEngineAlgorithmDTO.java index 8a9e0cc5653167ceae5e3073cf12aed42a31fcc3..9aa2d953414a36f7f1298932e192711bec390bf6 100644 --- a/src/main/java/eu/hbp/mip/models/DTOs/MIPEngineAlgorithmDTO.java +++ b/src/main/java/eu/hbp/mip/models/DTOs/MIPEngineAlgorithmDTO.java @@ -36,6 +36,8 @@ public class MIPEngineAlgorithmDTO { public Optional<Hashtable<String, MIPEngineAlgorithmParameterDTO>> getParameters() { return Optional.ofNullable(parameters); } + + @Data @AllArgsConstructor public static class MIPEngineAlgorithmParameterDTO { @@ -65,7 +67,29 @@ public class MIPEngineAlgorithmDTO { private String default_value; @SerializedName("enums") - private List<String> enums; + private MIPEngineAlgorithmEnumDTO enums; + + @SerializedName("dict_keys_enums") + private MIPEngineAlgorithmEnumDTO dict_keys_enums; + + @SerializedName("dict_values_enums") + private MIPEngineAlgorithmEnumDTO dict_values_enums; + + public Optional<MIPEngineAlgorithmEnumDTO> getEnums() { + return Optional.ofNullable(enums); + } + + @Data + @AllArgsConstructor + public static class MIPEngineAlgorithmEnumDTO { + + @SerializedName("type") + private String type; + + @SerializedName("source") + private List<String> source; + + } } @Data diff --git a/src/main/java/eu/hbp/mip/services/AlgorithmService.java b/src/main/java/eu/hbp/mip/services/AlgorithmService.java index dd2d605b6723a4a93845208b14825314d7b6e283..cf5d797f0d6c46dc0bfc2eda09bc5fb9ee977a18 100644 --- a/src/main/java/eu/hbp/mip/services/AlgorithmService.java +++ b/src/main/java/eu/hbp/mip/services/AlgorithmService.java @@ -65,7 +65,6 @@ public class AlgorithmService { ArrayList<ExaremeAlgorithmDTO> mipengineAlgorithms = getMIPEngineAlgorithms(logger); ArrayList<ExaremeAlgorithmDTO> exaremeAlgorithms = getExaremeAlgorithms(logger); ArrayList<ExaremeAlgorithmDTO> galaxyAlgorithms = getGalaxyWorkflows(logger); - ArrayList<ExaremeAlgorithmDTO> algorithms = new ArrayList<>(); // Remove Exareme algorithms that exist in the Exareme2