Skip to content

Commit

Permalink
Volver a CRAN
Browse files Browse the repository at this point in the history
  • Loading branch information
RichDeto committed Mar 21, 2022
1 parent 6e0bd90 commit 32ddf83
Show file tree
Hide file tree
Showing 88 changed files with 7,286 additions and 11,880 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: ech
Title: Toolbox for ECH with R
Version: 0.1.1.3
Version: 0.1.2.0
Authors@R:
c(person(given = "Gabriela",
family = "Mathieu",
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ importFrom(dplyr,everything)
importFrom(dplyr,filter)
importFrom(dplyr,filter_all)
importFrom(dplyr,group_by)
importFrom(dplyr,if_any)
importFrom(dplyr,left_join)
importFrom(dplyr,mutate)
importFrom(dplyr,mutate_all)
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# log history of ech package development

## ech v0.1.2.0
*minor changes. fix organize_names

## ech v0.1.1.3
*minor changes. fix organize_names

Expand Down
7 changes: 4 additions & 3 deletions R/organize.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#' @param level (string) indicates whether the base to be labelled is of the type "household", "h", "individual", "i" or both, "hyp". Default "hyp"
#' @param year numeric reference year of the data. Available from 2011 to 2019
#' @export
#' @importFrom dplyr if_any
#' @details
#' Disclaimer: This script is not an official INE product.
#' Aviso: El script no es un producto oficial de INE.
Expand All @@ -23,9 +24,9 @@ organize_names <- function(data, year, level = "hyp"){
nh <- n %>%
dplyr::filter(!duplicated(var17)) %>%
dplyr::select(paste0("var", c(substr(year,3,4), 17))) %>%
tidyr::drop_na()
#data <- data %>% dplyr::select(vars(nh[,1]))
#names(data) <- nh[,2]
dplyr::filter(if_any("", " "))
data <- data %>% dplyr::select(nh[,1])
names(data) <- nh[,2]
}
if(level %in% c("hogar","h")){
nh <- n %>%
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
[![CRAN/METACRAN
Version](https://www.r-pkg.org/badges/version/ech)](https://CRAN.R-project.org/package=ech)
[![CRAN/METACRAN Total
downloads](http://cranlogs.r-pkg.org/badges/grand-total/ech?color=blue)](https://CRAN.R-project.org/package=ech)
downloads](https://cranlogs.r-pkg.org/badges/grand-total/ech?color=blue)](https://CRAN.R-project.org/package=ech)
[![CRAN/METACRAN downloads per
month](http://cranlogs.r-pkg.org/badges/ech?color=orange)](https://CRAN.R-project.org/package=ech)
month](https://cranlogs.r-pkg.org/badges/ech?color=orange)](https://CRAN.R-project.org/package=ech)
[![R build
status](https://github.com/calcita/ech//workflows/R-CMD-check/badge.svg)](https://github.com/calcita/ech//actions)
[![AppVeyor build
status](https://ci.appveyor.com/api/projects/status/github/calcita/ech?branch=master&svg=true)](https://ci.appveyor.com/project/calcita/ech)
[![Codecov test
coverage](https://codecov.io/gh/calcita/ech/branch/master/graph/badge.svg)](https://codecov.io/gh/calcita/ech?branch=master)
coverage](https://codecov.io/gh/calcita/ech/branch/master/graph/badge.svg)](https://app.codecov.io/gh/calcita/ech?branch=master)
[![DOI](https://zenodo.org/badge/224897952.svg)](https://zenodo.org/badge/latestdoi/224897952)
<!-- badges: end -->

Expand Down
113 changes: 38 additions & 75 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 32ddf83

Please sign in to comment.