diff --git a/R/readdesign.R b/R/readdesign.R index d512e32722ef9d0adea053029dd76d91fe5eb9c5..699ff04168f6385b187919c7fb9e49a162c21ff2 100644 --- a/R/readdesign.R +++ b/R/readdesign.R @@ -20,7 +20,25 @@ -readdesign <- function(design = designfile, designtype = destype) { +readdesign <- function(design = designfile, designtype = NULL) { + + # if (is.null(designtype)) { + # + # + # + # # Check if the string ends with ".ngd" + # if (grepl("\\.ngd$", designfile)) { + # # Code to execute if condition is true + # designtype = "ngene" + # print("I guessed it is an ngene file") + # } else { + # # Code to execute if condition is false + # designtype = "spdesign" + # print("I assume it is a spdesign") + # } + # + # } + design <- switch(designtype, "ngene" = suppressWarnings(readr::read_delim(design, delim = "\t", diff --git a/tests/manual-tests/test_decisiongroups.R b/tests/manual-tests/test_decisiongroups.R index 76c35118b9cb7a1e27b0fb25e682aa64105b3bfc..147a7366cfb98bdb21d99ff89b46ca4bc0f08bde 100644 --- a/tests/manual-tests/test_decisiongroups.R +++ b/tests/manual-tests/test_decisiongroups.R @@ -256,9 +256,9 @@ apollo_probabilities=function(apollo_beta, apollo_inputs, functionality="estimat # ################################################################# # ### Optional starting values search -# apollo_beta=apollo_searchStart(apollo_beta, apollo_fixed,apollo_probabilities, apollo_inputs) +apollo_beta=apollo_searchStart(apollo_beta, apollo_fixed,apollo_probabilities, apollo_inputs) -model = apollo_estimate(apollo_beta, apollo_fixed, apollo_probabilities, apollo_inputs ,estimate_settings =list(estimationRoutine="bhhh" , hessianRoutine= "maxLik")) +model = apollo_estimate(apollo_beta, apollo_fixed, apollo_probabilities, apollo_inputs ) #,estimate_settings =list(estimationRoutine="bhhh" , hessianRoutine= "maxLik") # ################################################################# # #### MODEL OUTPUTS ####