Compare commits

..

No commits in common. "9b81c4b34a4b7ddedc9df976e9140d3534e84d74" and "b5152b5e707841d9539384f92eab8e5651745f17" have entirely different histories.

4 changed files with 7 additions and 23 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@ -1,6 +1,6 @@
Package: daDoctoR Package: daDoctoR
Title: Functions For Health Research Title: Functions For Health Research
Version: 0.22.4 Version: 0.22.1
Year: 2021 Year: 2021
Author: Andreas Gammelgaard Damsbo <agdamsbo@pm.me> Author: Andreas Gammelgaard Damsbo <agdamsbo@pm.me>
Maintainer: Andreas Gammelgaard Damsbo <agdamsbo@pm.me> Maintainer: Andreas Gammelgaard Damsbo <agdamsbo@pm.me>
@ -10,4 +10,4 @@ Suggest: shiny
License: GPL (>= 2) License: GPL (>= 2)
Encoding: UTF-8 Encoding: UTF-8
LazyData: true LazyData: true
RoxygenNote: 7.2.1 RoxygenNote: 7.1.2

View File

@ -12,21 +12,9 @@ dob_extract_cpr<-function(cpr)
## Input as cpr-numbers in format ddmmyy-xxxx ## Input as cpr-numbers in format ddmmyy-xxxx
## Build upon data from this document: https://cpr.dk/media/167692/personnummeret%20i%20cpr.pdf ## Build upon data from this document: https://cpr.dk/media/167692/personnummeret%20i%20cpr.pdf
## example vector: fsd<-c("010190-2000", "010115-4000", "010189-6000","010189-3000","010150-6000","010150-4000") ## example vector: fsd<-c("010190-2000", "010115-4000", "010189-6000","010189-3000","010150-6000","010150-4000")
## cpr <- "231045-0637"
## cpr <- "2310450637"
{ {
if (any(substr(cpr,7,7)%in%c(0:9))){stop("Input format should be ddmmyy-xxxx")} # test if input is ddmmyyxxxx
if (any(substr(cpr,7,7)=="-")){ # test if input is ddmmyy-xxxx, standard format else {
message("Input er i formatet ddmmyy-xxxx")
cpr_std<-TRUE
}
if (any(substr(cpr,7,7)%in%c(0:9))){
message("Input er i formatet ddmmyyxxxx") # test if input is ddmmyyxxxx
cpr_std<-FALSE
}
dobs<-c() dobs<-c()
a00<-as.numeric(c(0:99)) a00<-as.numeric(c(0:99))
@ -39,9 +27,7 @@ dob_extract_cpr<-function(cpr)
for (x in cpr) for (x in cpr)
{ {
p56<-as.numeric(substr(x,5,6)) p56<-as.numeric(substr(x,5,6))
p8<-as.numeric(substr(x,8,8))
if (cpr_std){p8<-as.numeric(substr(x,8,8))} else {p8<-as.numeric(substr(x,9,9))}
birth<-as.Date(substr(x,1,6),format="%d%m%y") birth<-as.Date(substr(x,1,6),format="%d%m%y")
@ -72,5 +58,5 @@ dob_extract_cpr<-function(cpr)
} }
return(dobs) return(dobs)
}
} }

View File

@ -1,7 +1,5 @@
library(roxygen2, devtools) library(roxygen2, devtools)
setwd("/Users/au301842/daDoctoR/")
source("updatePackageVersion.R") source("updatePackageVersion.R")
updatePackageVersion() updatePackageVersion()
@ -14,7 +12,7 @@ devtools::document()
# Commit and push # Commit and push
commit_message<-"updated dob_extract_cpr to also support cpr format ddmmyyxxxx" commit_message<-"age_calc update to handle vector of enddates"
library(git2r) library(git2r)
library(lubridate) library(lubridate)