Fixed addAlleles()
This commit is contained in:
parent
9e3ea49398
commit
036ec00bbd
1 changed files with 2 additions and 3 deletions
|
|
@ -11,7 +11,7 @@ addAlleles <- function(data, ind, line, divider) {
|
||||||
# line. Jos data on 3 digit formaatissa on divider=1000.
|
# line. Jos data on 3 digit formaatissa on divider=1000.
|
||||||
# Jos data on 2 digit formaatissa on divider=100.
|
# Jos data on 2 digit formaatissa on divider=100.
|
||||||
|
|
||||||
nloci <- size(data, 2) # added 1 from original code
|
nloci <- size(data, 2) - 1L
|
||||||
if (size(data, 1) < (2 * ind)) {
|
if (size(data, 1) < (2 * ind)) {
|
||||||
data <- rbind(data, zeros(100, nloci)) # subtracted 1 from original code
|
data <- rbind(data, zeros(100, nloci)) # subtracted 1 from original code
|
||||||
}
|
}
|
||||||
|
|
@ -22,8 +22,7 @@ addAlleles <- function(data, ind, line, divider) {
|
||||||
k <- k + 1
|
k <- k + 1
|
||||||
merkki <- substring(line, k, k)
|
merkki <- substring(line, k, k)
|
||||||
}
|
}
|
||||||
line <- substring(line, k + 1)
|
line <- trimws(substring(line, k + 1))
|
||||||
# clear k; clear merkki;
|
|
||||||
|
|
||||||
if (grepl(" ", line)) {
|
if (grepl(" ", line)) {
|
||||||
alleeliTaulu <- as.numeric(strsplit(line, split = " ")[[1]])
|
alleeliTaulu <- as.numeric(strsplit(line, split = " ")[[1]])
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue