From 33c0f758aa449a30b5c84a94c627393ac9150bc4 Mon Sep 17 00:00:00 2001
From: Julian Sagebiel <julian.sagebiel@idiv.de>
Date: Sat, 21 Dec 2024 21:23:41 +0100
Subject: [PATCH] lets identify automatically if it is idefix
---
R/readdesign.R | 9 ++++++---
tests/manual-tests/test_idefix.R | 11 +++++++++--
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/R/readdesign.R b/R/readdesign.R
index 2b7bf82..12ae50c 100644
--- a/R/readdesign.R
+++ b/R/readdesign.R
@@ -41,10 +41,13 @@ readdesign <- function(design = designfile, designtype = NULL, destype = NULL) {
# Code to execute if condition is true
designtype = "ngene"
message("I guessed it is an ngene file")
- } else {
- # Code to execute if condition is false
+ } else if("spdesign" %in% class(readRDS(design)) ) {
+
designtype = "spdesign"
- message("I assume it is a spdesign")
+ message("I assume it is a spdesign.")
+ } else {
+ designtype <- "idefix"
+ message("I assume it is an idefix design.")
}
}
diff --git a/tests/manual-tests/test_idefix.R b/tests/manual-tests/test_idefix.R
index 7da2b57..3713f14 100644
--- a/tests/manual-tests/test_idefix.R
+++ b/tests/manual-tests/test_idefix.R
@@ -1,14 +1,21 @@
devtools::load_all()
+design_ngene <- system.file("extdata","agora", "altscf_eff.ngd" ,package = "simulateDCE")
+
+t0 <- readdesign(design_ngene)
+
design_sp <- system.file("extdata","ValuGaps", "des1.RDS" ,package = "simulateDCE")
-design_idefix <- system.file("extdata","Idefix_designs", "test_design2.RDS" ,package = "simulateDCE")
+
t <-readdesign(design_sp)
t2 <-readdesign(design_sp, designtype = "spdesign")
identical(t,t2)
-t3 <-readdesign(design_idefix, designtype = "idefix")
+
+design_idefix <- system.file("extdata","Idefix_designs", "test_design2.RDS" ,package = "simulateDCE")
+
+t3 <-readdesign(design_idefix)
--
GitLab