From 2944039f73a2d0e22663e9641205a8eee6b59307 Mon Sep 17 00:00:00 2001 From: Erik de Vries Date: Tue, 25 Jan 2022 18:57:12 +0100 Subject: [PATCH] test --- R/sent_merger.R | 4 ---- 1 file changed, 4 deletions(-) diff --git a/R/sent_merger.R b/R/sent_merger.R index 9de3c64..7ae5b3b 100644 --- a/R/sent_merger.R +++ b/R/sent_merger.R @@ -201,11 +201,7 @@ sent_merger <- function(df, actors_meta = NULL, actor_groups = NULL, pos_cutoff publication_date = first(publication_date) ), by = c('id','partyId')] # Summarize by article and partyId # Add party metadata -<<<<<<< HEAD - parties_actors2 <- actors_meta[str_starts(ids, 'P_')][parties_actors, on = c('partyId'), mult = 'first'][!is.na(id),.(ids = str_c(partyId,"_mfsa"), (.SD)), .SDcols = -c('ids')] -======= parties_actors <- actors_meta[str_starts(ids, 'P_')][parties_actors, on = c('partyId'), mult = 'first'][!is.na(id),.(ids = str_c(partyId,"_mfsa"), (.SD)), .SDcols = -c('ids')] ->>>>>>> ce430ca (sent_merger: Correctly add party metadata for _mfsa aggregations) ## Generate party aggregations (mfs) parties <- df[str_ends(ids,'_f') | str_ends(ids,'_s'),.(