v0.41

jendelman · Feb 8, 2024 · ea2b00b · ea2b00b
1 parent ed09201
commit ea2b00b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: polyBreedR
 Title: Genomics-assisted breeding for polyploids (and diploids)
-Version: 0.40
+Version: 0.41
 Author: Jeffrey B. Endelman
 Maintainer: Jeffrey Endelman <[email protected]>
 Description: Genomics-assisted breeding for polyploids (and diploids)

diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+Changes in 0.41
+* Generalized data input for madc
+
 Changes in 0.40
 * OFP20 option in madc
 

diff --git a/R/madc.R b/R/madc.R
@@ -17,8 +17,15 @@
 
 madc <- function(madc.file, marker) {
 
-  data <- fread(madc.file,skip=7)
-  tmp <- as.matrix(data[,17:ncol(data)])
+  con <- file(madc.file,open="r")
+  tmp <- readLines(con,n=10)
+  first.row <- grep("AlleleID",tmp)
+  ik <- which(strsplit(tmp[1],split=",")[[1]]!="*")
+  first.col <- min(ik)
+  close(con)
+
+  data <- fread(madc.file,skip=first.row-1)
+  tmp <- as.matrix(data[,first.col:ncol(data)])
   id <- colnames(tmp)
   n <- length(id)