Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: tidyverse/tidyr
Choose a Base Repository
tidyverse/tidyr
82ndAirborneDiv/tidyr
AhuPersonal/tidyr
AlexPiche/tidyr
AmeCostantini/tidyr
AndreMikulec/tidyr
Angus-Luo/tidyr
Bekterra/tidyr
BernhardKonrad/tidyr
BlueFx/tidyr
CesarMaalouf/tidyr
DanKHansen/tidyr
DocOfi/tidyr
Eemaa26/tidyr
Elpsytao/tidyr
EricChiuRun/tidyr
G-Bruce/tidyr
GShotwell/tidyr
HHHuiyu/tidyr
Isaac1989/tidyr
JerryWho/tidyr
Jofou/tidyr
Juzenn/tidyr
Katarzynaa/tidyr
KevinCayenne/tidyr
LuisM78/tidyr
MilesMcBain/tidyr
MiloudEloumri/tidyr
NHisato/tidyr
PankajKumarDwivedi/tidyr
Phaedrus1/tidyr
Przemo10/tidyr
QualityMeasurement/tidyr
Quiri/tidyr
Rajesh16702/tidyr
Ravirajadrangi/tidyr
RoyalTS/tidyr
Sandy4321/tidyr
TintingLi/tidyr
Tutuchan/tidyr
Valbat/tidyr
YOSON-Y/tidyr
Yarovik/tidyr
aaronwolen/tidyr
abiyug/tidyr
akpadhi/tidyr
alvis-huang/tidyr
amarchin/tidyr
aniket535/tidyr
antoine-lizee/tidyr
avrp2002/tidyr
awesome1jh/tidyr
benda1997/tidyr
bestwpw/tidyr
bingoCo/tidyr
caluchko/tidyr
cannin/tidyr
cderv/tidyr
chingoduc/tidyr
codetriage-readme-bot/tidyr
colearendt/tidyr
connectthefuture/tidyr
conradbm/tidyr
cpsievert/tidyr
d8aninja/tidyr
damonzon/tidyr
danilosoto/tidyr
danliIDEA/tidyr
dannykugler/tidyr
dataguy-anil/tidyr
david2tong/tidyr
david5ive/tidyr
defconst/tidyr
dfalbel/tidyr
dgromer/tidyr
dgrtwo/tidyr
dhashman/tidyr
dhimmel/tidyr
dholstius/tidyr
echasnovski/tidyr
elephann/tidyr
eupimenta/tidyr
fdzul/tidyr
feuerbach/tidyr
flying-sheep/tidyr
foundinblank/tidyr
fpcMotif/tidyr
galius/tidyr
garrettgman/tidyr
gergness/tidyr
gfarries/tidyr
gig7/tidyr
githubfun/tidyr
halpo/tidyr
hyiltiz/tidyr
iamjoshbinder/tidyr
imanns/tidyr
jankatins/tidyr
jasenasia/tidyr
jbdatascience/tidyr
jcrb/tidyr
jerryShad/tidyr
jharr4420/tidyr
jimhester/tidyr
jjchern/tidyr
jmcimula/tidyr
joshkatz/tidyr
jpedrofreitas7/tidyr
jschroeder23/tidyr
juliacrapo/tidyr
junjiemao/tidyr
justolowo/tidyr
jvallee97/tidyr
karaesmen/tidyr
karthik/tidyr
kghub/tidyr
kismsu/tidyr
kmaheshkulkarni/tidyr
krlmlr/tidyr
kskand/tidyr
ldecicco-USGS/tidyr
lgreski/tidyr
lilf/tidyr
lionel-/tidyr
lorenzwalthert/tidyr
magosil86/tidyr
marcds/tidyr
markriseley/tidyr
marlenne/tidyr
masslab/tidyr
maurolepore/tidyr
mherradora/tidyr
minhpascal/tidyr
mjdata/tidyr
mkcor/tidyr
mlist/tidyr
mmaltz/tidyr
nathania/tidyr
ncarchedi/tidyr
ngr-t/tidyr
njtierney/tidyr
nu-ree/tidyr
odranitsin/tidyr
pangkj/tidyr
paulponcet/tidyr
pgensler/tidyr
phani111/tidyr
poldham/tidyr
ptolmach/tidyr
rcxbvisualization/tidyr
reggie19500722/tidyr
rlugojr/tidyr
rmsharp/tidyr
rocren191/tidyr
sananand007/tidyr
sayuriTakeda/tidyr
sebkopf/tidyr
sergioquadros/tidyr
sezzagore/tidyr
shazrul205/tidyr
sontrip/tidyr
statisfactions/tidyr
stefanfritsch/tidyr
sthagen/tidyr
suimong/tidyr
sunilkumar87/tidyr
sunnycd/tidyr
suraggupta/tidyr
sveinbjornyngvi/tidyr
tamilyn/tidyr
tbrugz/tidyr
thomasp85/tidyr
tjmahr/tidyr
trickytank/tidyr
trinker/tidyr
tudaga/tidyr
tudeschini/tidyr
tverbeke/tidyr
venkat-othisamy/tidyr
vinylcatfish/tidyr
vkarthi46/tidyr
w9/tidyr
way2joy/tidyr
wenlu510/tidyr
wibeasley/tidyr
xet869/tidyr
xiaojyan/tidyr
xiaowenchenjax/tidyr
xpingli/tidyr
xtmgah/tidyr
xulukai/tidyr
xumaoxuan/tidyr
yalinmao/tidyr
yenwel/tidyr
yifeizhang/tidyr
ymatts/tidyr
yutannihilation/tidyr
zeehio/tidyr
zenabbohra/tidyr
zhao-hailei/tidyr
Nothing to show
base: 3899ed51
head repository: tidyverse/tidyr
Choose a Head Repository
tidyverse/tidyr
82ndAirborneDiv/tidyr
AhuPersonal/tidyr
AlexPiche/tidyr
AmeCostantini/tidyr
AndreMikulec/tidyr
Angus-Luo/tidyr
Bekterra/tidyr
BernhardKonrad/tidyr
BlueFx/tidyr
CesarMaalouf/tidyr
DanKHansen/tidyr
DocOfi/tidyr
Eemaa26/tidyr
Elpsytao/tidyr
EricChiuRun/tidyr
G-Bruce/tidyr
GShotwell/tidyr
HHHuiyu/tidyr
Isaac1989/tidyr
JerryWho/tidyr
Jofou/tidyr
Juzenn/tidyr
Katarzynaa/tidyr
KevinCayenne/tidyr
LuisM78/tidyr
MilesMcBain/tidyr
MiloudEloumri/tidyr
NHisato/tidyr
PankajKumarDwivedi/tidyr
Phaedrus1/tidyr
Przemo10/tidyr
QualityMeasurement/tidyr
Quiri/tidyr
Rajesh16702/tidyr
Ravirajadrangi/tidyr
RoyalTS/tidyr
Sandy4321/tidyr
TintingLi/tidyr
Tutuchan/tidyr
Valbat/tidyr
YOSON-Y/tidyr
Yarovik/tidyr
aaronwolen/tidyr
abiyug/tidyr
akpadhi/tidyr
alvis-huang/tidyr
amarchin/tidyr
aniket535/tidyr
antoine-lizee/tidyr
avrp2002/tidyr
awesome1jh/tidyr
benda1997/tidyr
bestwpw/tidyr
bingoCo/tidyr
caluchko/tidyr
cannin/tidyr
cderv/tidyr
chingoduc/tidyr
codetriage-readme-bot/tidyr
colearendt/tidyr
connectthefuture/tidyr
conradbm/tidyr
cpsievert/tidyr
d8aninja/tidyr
damonzon/tidyr
danilosoto/tidyr
danliIDEA/tidyr
dannykugler/tidyr
dataguy-anil/tidyr
david2tong/tidyr
david5ive/tidyr
defconst/tidyr
dfalbel/tidyr
dgromer/tidyr
dgrtwo/tidyr
dhashman/tidyr
dhimmel/tidyr
dholstius/tidyr
echasnovski/tidyr
elephann/tidyr
eupimenta/tidyr
fdzul/tidyr
feuerbach/tidyr
flying-sheep/tidyr
foundinblank/tidyr
fpcMotif/tidyr
galius/tidyr
garrettgman/tidyr
gergness/tidyr
gfarries/tidyr
gig7/tidyr
githubfun/tidyr
halpo/tidyr
hyiltiz/tidyr
iamjoshbinder/tidyr
imanns/tidyr
jankatins/tidyr
jasenasia/tidyr
jbdatascience/tidyr
jcrb/tidyr
jerryShad/tidyr
jharr4420/tidyr
jimhester/tidyr
jjchern/tidyr
jmcimula/tidyr
joshkatz/tidyr
jpedrofreitas7/tidyr
jschroeder23/tidyr
juliacrapo/tidyr
junjiemao/tidyr
justolowo/tidyr
jvallee97/tidyr
karaesmen/tidyr
karthik/tidyr
kghub/tidyr
kismsu/tidyr
kmaheshkulkarni/tidyr
krlmlr/tidyr
kskand/tidyr
ldecicco-USGS/tidyr
lgreski/tidyr
lilf/tidyr
lionel-/tidyr
lorenzwalthert/tidyr
magosil86/tidyr
marcds/tidyr
markriseley/tidyr
marlenne/tidyr
masslab/tidyr
maurolepore/tidyr
mherradora/tidyr
minhpascal/tidyr
mjdata/tidyr
mkcor/tidyr
mlist/tidyr
mmaltz/tidyr
nathania/tidyr
ncarchedi/tidyr
ngr-t/tidyr
njtierney/tidyr
nu-ree/tidyr
odranitsin/tidyr
pangkj/tidyr
paulponcet/tidyr
pgensler/tidyr
phani111/tidyr
poldham/tidyr
ptolmach/tidyr
rcxbvisualization/tidyr
reggie19500722/tidyr
rlugojr/tidyr
rmsharp/tidyr
rocren191/tidyr
sananand007/tidyr
sayuriTakeda/tidyr
sebkopf/tidyr
sergioquadros/tidyr
sezzagore/tidyr
shazrul205/tidyr
sontrip/tidyr
statisfactions/tidyr
stefanfritsch/tidyr
sthagen/tidyr
suimong/tidyr
sunilkumar87/tidyr
sunnycd/tidyr
suraggupta/tidyr
sveinbjornyngvi/tidyr
tamilyn/tidyr
tbrugz/tidyr
thomasp85/tidyr
tjmahr/tidyr
trickytank/tidyr
trinker/tidyr
tudaga/tidyr
tudeschini/tidyr
tverbeke/tidyr
venkat-othisamy/tidyr
vinylcatfish/tidyr
vkarthi46/tidyr
w9/tidyr
way2joy/tidyr
wenlu510/tidyr
wibeasley/tidyr
xet869/tidyr
xiaojyan/tidyr
xiaowenchenjax/tidyr
xpingli/tidyr
xtmgah/tidyr
xulukai/tidyr
xumaoxuan/tidyr
yalinmao/tidyr
yenwel/tidyr
yifeizhang/tidyr
ymatts/tidyr
yutannihilation/tidyr
zeehio/tidyr
zenabbohra/tidyr
zhao-hailei/tidyr
Nothing to show
compare: 60f7c7d4
  • 12 commits
  • 10 files changed
  • 0 comments
  • 1 contributor
Showing with 148 additions and 167 deletions.
  1. +1 −1 .github/workflows/test-coverage.yaml
  2. +5 −1 DESCRIPTION
  3. +0 −19 R/RcppExports.R
  4. +19 −0 R/cpp11-exports.R
  5. +0 −3 R/fill.R
  6. +0 −74 src/RcppExports.cpp
  7. +58 −0 src/cpp11-exports.cpp
  8. +5 −6 src/fill.cpp
  9. +39 −46 src/melt.cpp
  10. +21 −17 src/simplifyPieces.cpp
@@ -35,7 +35,7 @@ jobs:
run: |
install.packages(c("remotes"))
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("covr")
remotes::install_cran("r-lib/covr")
shell: Rscript {0}

- name: Test coverage
@@ -48,10 +48,14 @@ Suggests:
readr,
testthat (>= 2.1.0)
LinkingTo:
Rcpp
cpp11
VignetteBuilder:
knitr
SystemRequirements: C++11
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.0
Remotes:
r-lib/cpp11,
rstudio/rmarkdown

This file was deleted.

@@ -0,0 +1,19 @@
# Generated by cpp11: do not edit by hand

fillDown <- function(x){
.Call("_tidyr_fillDown" , x)
}

fillUp <- function(x){
.Call("_tidyr_fillUp" , x)
}

melt_dataframe <- function(data, id_ind, measure_ind, variable_name, value_name, attrTemplate, factorsAsStrings, valueAsFactor, variableAsFactor){
.Call("_tidyr_melt_dataframe" , data, id_ind, measure_ind, variable_name, value_name, attrTemplate, factorsAsStrings, valueAsFactor, variableAsFactor)
}

simplifyPieces <- function(pieces, p, fillLeft){
.Call("_tidyr_simplifyPieces" , pieces, p, fillLeft)
}


@@ -1,6 +1,3 @@
#' @importFrom Rcpp sourceCpp
NULL

#' Fill in missing values with previous or next value
#'
#' Fills missing values in selected columns using the next or previous entry.

This file was deleted.

@@ -0,0 +1,58 @@
// Generated by cpp11: do not edit by hand

#include "cpp11/declarations.hpp"


// fill.cpp
SEXP fillDown(SEXP x);
extern "C" SEXP _tidyr_fillDown(SEXP x) {
BEGIN_CPP11
return cpp11::as_sexp(fillDown(cpp11::unmove(cpp11::as_cpp<SEXP>(x))));
END_CPP11
}
// fill.cpp
SEXP fillUp(SEXP x);
extern "C" SEXP _tidyr_fillUp(SEXP x) {
BEGIN_CPP11
return cpp11::as_sexp(fillUp(cpp11::unmove(cpp11::as_cpp<SEXP>(x))));
END_CPP11
}
// melt.cpp
cpp11::list melt_dataframe(cpp11::data_frame data, const cpp11::integers& id_ind, const cpp11::integers& measure_ind, cpp11::strings variable_name, cpp11::strings value_name, cpp11::sexp attrTemplate, bool factorsAsStrings, bool valueAsFactor, bool variableAsFactor);
extern "C" SEXP _tidyr_melt_dataframe(SEXP data, SEXP id_ind, SEXP measure_ind, SEXP variable_name, SEXP value_name, SEXP attrTemplate, SEXP factorsAsStrings, SEXP valueAsFactor, SEXP variableAsFactor) {
BEGIN_CPP11
return cpp11::as_sexp(melt_dataframe(cpp11::unmove(cpp11::as_cpp<cpp11::data_frame>(data)), cpp11::unmove(cpp11::as_cpp<const cpp11::integers&>(id_ind)), cpp11::unmove(cpp11::as_cpp<const cpp11::integers&>(measure_ind)), cpp11::unmove(cpp11::as_cpp<cpp11::strings>(variable_name)), cpp11::unmove(cpp11::as_cpp<cpp11::strings>(value_name)), cpp11::unmove(cpp11::as_cpp<cpp11::sexp>(attrTemplate)), cpp11::unmove(cpp11::as_cpp<bool>(factorsAsStrings)), cpp11::unmove(cpp11::as_cpp<bool>(valueAsFactor)), cpp11::unmove(cpp11::as_cpp<bool>(variableAsFactor))));
END_CPP11
}
// simplifyPieces.cpp
cpp11::list simplifyPieces(cpp11::list pieces, int p, bool fillLeft);
extern "C" SEXP _tidyr_simplifyPieces(SEXP pieces, SEXP p, SEXP fillLeft) {
BEGIN_CPP11
return cpp11::as_sexp(simplifyPieces(cpp11::unmove(cpp11::as_cpp<cpp11::list>(pieces)), cpp11::unmove(cpp11::as_cpp<int>(p)), cpp11::unmove(cpp11::as_cpp<bool>(fillLeft))));
END_CPP11
}

extern "C" {
/* .Call calls */
extern SEXP _tidyr_fillDown(SEXP);
extern SEXP _tidyr_fillUp(SEXP);
extern SEXP _tidyr_melt_dataframe(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP _tidyr_simplifyPieces(SEXP, SEXP, SEXP);

static const R_CallMethodDef CallEntries[] = {
{"_tidyr_fillDown", (DL_FUNC) &_tidyr_fillDown, 1},
{"_tidyr_fillUp", (DL_FUNC) &_tidyr_fillUp, 1},
{"_tidyr_melt_dataframe", (DL_FUNC) &_tidyr_melt_dataframe, 9},
{"_tidyr_simplifyPieces", (DL_FUNC) &_tidyr_simplifyPieces, 3},
{NULL, NULL, 0}
};
}



extern "C" void R_init_tidyr(DllInfo* dll){
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
R_useDynamicSymbols(dll, FALSE);

}

@@ -1,7 +1,6 @@
#include <Rcpp.h>
using namespace Rcpp;
#include "cpp11/protect.hpp"

// [[Rcpp::export]]
[[cpp11::export]]
SEXP fillDown(SEXP x) {
int n = Rf_length(x);
SEXP out = Rf_allocVector(TYPEOF(x), n);
@@ -71,15 +70,15 @@ SEXP fillDown(SEXP x) {

}
default:
stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
cpp11::stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
}

Rf_copyMostAttrib(x, out);
return out;
}


// [[Rcpp::export]]
[[cpp11::export]]
SEXP fillUp(SEXP x) {
int n = Rf_length(x);
SEXP out = Rf_allocVector(TYPEOF(x), n);
@@ -149,7 +148,7 @@ SEXP fillUp(SEXP x) {

}
default:
stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
cpp11::stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
}

Rf_copyMostAttrib(x, out);

No commit comments for this range

You can’t perform that action at this time.