From 0dfb79fb47846de44b35ef71f112e1c9afbf002b Mon Sep 17 00:00:00 2001 From: Richard Martin-Nielsen Date: Mon, 14 Mar 2022 22:09:13 +0200 Subject: [PATCH 1/5] Initial change to use InPhyT data for Italy Currently fails in single class test but seems to work to generate results. --- R/Italy.R | 39 ++++++++++--------- data/all_country_data.rda | Bin 2965 -> 3078 bytes tests/testthat/custom_data/Italy_level_1.rds | Bin 17726 -> 1252 bytes 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/R/Italy.R b/R/Italy.R index 18fd963e..2766056b 100644 --- a/R/Italy.R +++ b/R/Italy.R @@ -30,16 +30,16 @@ Italy <- R6::R6Class("Italy", #' only entry, is be named main. # nolint start common_data_urls = list( - "main" = "https://raw.githubusercontent.com/pcm-dpc/COVID-19/master/dati-regioni/dpc-covid19-ita-regioni.csv" + "main" = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data/raw/use_initial_conditions/epiforecasts_covidregionaldata/COVID19-Italy-Integrated-Surveillance-Data.csv" ), # nolint end #' @field source_data_cols existing columns within the raw data - source_data_cols = c("cases_total", "deaths_total", "tested_total"), + source_data_cols = c("cases_new", "deaths_new", "hosp_new"), #' @field source_text Plain text description of the source of the data - source_text = "Department of Civil Protection, Italy", + source_text = "Pietro Monticone and Claudio Moroni, Interdisciplinary Physics Team (InPhyT)", #' @field source_url Website address for explanation/introduction of the #' data - source_url = "https://github.com/pcm-dpc/COVID-19/blob/master/README_EN.md", + source_url = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data/blob/797ceacaee6e0e418715d235506d28656b8333ba/README.md", #' @description Set up a table of region codes for clean data #' @importFrom dplyr tibble @@ -61,37 +61,38 @@ Italy <- R6::R6Class("Italy", }, #' @description State level data cleaning - #' @importFrom dplyr mutate select arrange recode group_by ungroup - #' @importFrom lubridate as_date ymd_hms + #' @importFrom dplyr mutate select arrange recode group_by summarise + #' @importFrom lubridate as_date ymd #' @importFrom rlang .data #' clean_common = function() { self$data$clean <- self$data$raw[["main"]] %>% + group_by(date,region,indicator) %>% + summarise(across(where(is.double), sum), .groups = "drop") %>% mutate( - date = suppressWarnings(as_date(ymd_hms(.data$data))), - level_1_region = as.character(.data$denominazione_regione), - cases_total = .data$totale_casi, - deaths_total = .data$deceduti, - tested_total = .data$tamponi + date = suppressWarnings(as_date(ymd(.data$date))), + level_1_region = as.character(.data$region) + ) %>% + pivot_wider( + id_cols = c("date", "level_1_region"), + names_from = c("indicator"), + values_from = c("count") ) %>% arrange(.data$date) %>% mutate(level_1_region = recode(.data$level_1_region, "P.A. Trento" = "Trentino-Alto Adige", "P.A. Bolzano" = "Trentino-Alto Adige" )) %>% - group_by(.data$date, .data$level_1_region) %>% - summarise( - cases_total = sum(.data$cases_total, na.rm = TRUE), - deaths_total = sum(.data$deaths_total, na.rm = TRUE), - tested_total = sum(.data$tested_total, na.rm = TRUE), - ) %>% - ungroup() %>% full_join(self$codes_lookup[["1"]], by = c("level_1_region" = "region") ) %>% select(.data$date, .data$level_1_region, level_1_region_code = .data$code, - .data$cases_total, .data$deaths_total, .data$tested_total + cases_new = .data$confirmed, + deaths_new = .data$deceased, + hosp_new = .data$hospitalizations, + symp_new = .data$symptomatic, + care_new = .data$care ) } ) diff --git a/data/all_country_data.rda b/data/all_country_data.rda index 8e1c4d4f00988a562f7dceaf9af5db1633c3514e..298309ceb8ef00c071e146737f3afa9acc158e78 100644 GIT binary patch literal 3078 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 U5<_ADgg-^xkxmpO1^_!d062x3%m4rY literal 2965 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 LML1B9c=bNiZu4$V diff --git a/tests/testthat/custom_data/Italy_level_1.rds b/tests/testthat/custom_data/Italy_level_1.rds index 9dead9d2a8f46f0867ac537eca3b0a2fc16adba9..200fbe65cc4e94a61ee14b444509630ef7f20f64 100644 GIT binary patch literal 1252 zcmXxX3sh1E00v;x(#jT@k8IUp(+r36m2;#hwoILrS(&3WWghdnijzwv1#W0szUC|| zOO0lFd|(?h&x8rWQhrUE%^O;+5dQ`uY~be*D6|tEE=2Lyy)|!mY3Rz9SjEj2n%+ zSaORCrNCCmg&G{&5z&xeSu>BKa=%5xoN(Vmwb zU;~}-DC}muDVZe!U0kJgP&&g`Xc=$8=O`uLfgMl`!(F&3-in{Elxjgel*0%VnvG)U zmxz+>U>RHnN5By}Uum_v4@zeE2)B)z(>Vf3toi};4Z}@nKWa(O7l48>L6qtT6-V_I z%ZiO>;|*p8vrMc4tB9NQ_$OPTEK`}}tAYV6+tY;A4Uri*Ay$kViDU&WWAqk~8H{0W z229qis=C+sh^EHuZ>Kn>%0o+No&QYN6tKhz2ltqVss9ZfaL?Th{e6Nsyrc{f9z^z+EM84|%=cYx zaM1fv!ag#lw`n{TNY!x4pN++|G^0Tqr9E*+)HpOUq|rSxusc|pNZWaP=fcz$w}HCM z-X)g;J%vXO{CFaUI0oe0<%$w?ar{H`&V_p2_rqeoVTVyTq)&OJ>~Q?7bv`g?U`KH6 z`L?X?D$VkPNdawO8Pz;m(l5m+pOSn1m5c+iVE}h7mt{F4pxG)Xre;Y`=jUF_o@n3S z2ByiSju+~G9_<8%8d1di0Z&ZRvWRj01~0U0ku$~Akq_p+^+}2(X)5}?l3goS4)@A{ z{B33RvGkYWE;V0hZU#=3%0{-H^Dl|=zdf@x( z5AS`}oOaeW{o5iX@vayd0#CKyeyFV-yD%gFP}5h#R&Vw^cRwwcuy}G~BY?pT#~TTu G7|g$}>zvmB literal 17726 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 From d780dc3e15a150b9cbd027ac8c7a5c7f4423539d Mon Sep 17 00:00:00 2001 From: Richard Martin-Nielsen Date: Tue, 15 Mar 2022 22:05:02 +0200 Subject: [PATCH 2/5] Adjust to upstream changes and add comment about Trentino-Alto Adige --- R/Italy.R | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/R/Italy.R b/R/Italy.R index 2766056b..f3aac640 100644 --- a/R/Italy.R +++ b/R/Italy.R @@ -79,6 +79,8 @@ Italy <- R6::R6Class("Italy", values_from = c("count") ) %>% arrange(.data$date) %>% + # The region of Trentino-Alto Adige is made up of two self-governing + # provinces of Trento and Bolzano mutate(level_1_region = recode(.data$level_1_region, "P.A. Trento" = "Trentino-Alto Adige", "P.A. Bolzano" = "Trentino-Alto Adige" @@ -90,9 +92,9 @@ Italy <- R6::R6Class("Italy", level_1_region_code = .data$code, cases_new = .data$confirmed, deaths_new = .data$deceased, - hosp_new = .data$hospitalizations, + hosp_new = .data$ordinary_hospital_admission, symp_new = .data$symptomatic, - care_new = .data$care + icu_new = .data$ICU_admission ) } ) From d87a3ac9805c8583067b49b787ade2592f916e36 Mon Sep 17 00:00:00 2001 From: Richard Martin-Nielsen Date: Wed, 6 Apr 2022 22:09:00 +0300 Subject: [PATCH 3/5] Adjust source url for Italy from InPhyT --- R/Italy.R | 4 ++-- data-raw/render_available_datasets.R | 1 + data/all_country_data.rda | Bin 3078 -> 3070 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/R/Italy.R b/R/Italy.R index f3aac640..7887d154 100644 --- a/R/Italy.R +++ b/R/Italy.R @@ -30,7 +30,7 @@ Italy <- R6::R6Class("Italy", #' only entry, is be named main. # nolint start common_data_urls = list( - "main" = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data/raw/use_initial_conditions/epiforecasts_covidregionaldata/COVID19-Italy-Integrated-Surveillance-Data.csv" + "main" = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data/blob/main/epiforecasts_covidregionaldata/COVID19-Italy-Integrated-Surveillance-Data.csv" ), # nolint end #' @field source_data_cols existing columns within the raw data @@ -39,7 +39,7 @@ Italy <- R6::R6Class("Italy", source_text = "Pietro Monticone and Claudio Moroni, Interdisciplinary Physics Team (InPhyT)", #' @field source_url Website address for explanation/introduction of the #' data - source_url = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data/blob/797ceacaee6e0e418715d235506d28656b8333ba/README.md", + source_url = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data", #' @description Set up a table of region codes for clean data #' @importFrom dplyr tibble diff --git a/data-raw/render_available_datasets.R b/data-raw/render_available_datasets.R index 214d2edc..b904d26c 100644 --- a/data-raw/render_available_datasets.R +++ b/data-raw/render_available_datasets.R @@ -2,3 +2,4 @@ all_country_data <- get_available_datasets(render = TRUE) usethis::use_data(all_country_data, overwrite = TRUE) +# \ No newline at end of file diff --git a/data/all_country_data.rda b/data/all_country_data.rda index 298309ceb8ef00c071e146737f3afa9acc158e78..e574dfc6fc9d3898252745530cce666b05a72b47 100644 GIT binary patch literal 3070 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 MBAh5lO!P=bfW=6>X#fBK literal 3078 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 U5<_ADgg-^xkxmpO1^_!d062x3%m4rY From 7960bba4121a56ecff8a95c953d705693c94c5a3 Mon Sep 17 00:00:00 2001 From: Richard Martin-Nielsen Date: Wed, 6 Apr 2022 22:21:56 +0300 Subject: [PATCH 4/5] Append raw=true for url downloading large CSV from github --- R/Italy.R | 2 +- data-raw/render_available_datasets.R | 1 - data/all_country_data.rda | Bin 3070 -> 3065 bytes 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/R/Italy.R b/R/Italy.R index 7887d154..0a37acf9 100644 --- a/R/Italy.R +++ b/R/Italy.R @@ -30,7 +30,7 @@ Italy <- R6::R6Class("Italy", #' only entry, is be named main. # nolint start common_data_urls = list( - "main" = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data/blob/main/epiforecasts_covidregionaldata/COVID19-Italy-Integrated-Surveillance-Data.csv" + "main" = "https://github.com/InPhyT/COVID19-Italy-Integrated-Surveillance-Data/raw/main/epiforecasts_covidregionaldata/COVID19-Italy-Integrated-Surveillance-Data.csv?raw=true" ), # nolint end #' @field source_data_cols existing columns within the raw data diff --git a/data-raw/render_available_datasets.R b/data-raw/render_available_datasets.R index b904d26c..214d2edc 100644 --- a/data-raw/render_available_datasets.R +++ b/data-raw/render_available_datasets.R @@ -2,4 +2,3 @@ all_country_data <- get_available_datasets(render = TRUE) usethis::use_data(all_country_data, overwrite = TRUE) -# \ No newline at end of file diff --git a/data/all_country_data.rda b/data/all_country_data.rda index e574dfc6fc9d3898252745530cce666b05a72b47..ce13307ca2b6dc0f6bbd7278552ac795734a9721 100644 GIT binary patch literal 3065 zcmVH004wQ2m*kh z00H0(o_+6K!{1l{Kr?9Ro46V}?QH`ioM2=-yQ&gNG$E21)CIA3KMg(90i~s^5qH21X z0W>r)m_X1C0j2;z$)IS+27okT21W@I6G<{AfCs41(9mh19-tZk4GlCj06jne00dG+ zH=!8`pambQ0~!X1#L=dVji|_Bpa26vG=oMUksysGCW2^bGH9ms)X0p~)6{8@G8$w6 z&^)6?ni@0)fYaauKwrOhDJ4*foC=r68c@mz+>;Q*Iu%U=&j|%T#=W&u>a%RETLgtr zm&5v)Qb2cMGll&=Pl9Oz1C^loHTk{YxBI>WEH^R^sW)fw8_E+IQvhN7CF^tx^M@P7 z69FsOT>=dNiW8Jb1QL--V$aHP4!}7TX=E8T0z?Tycnc^51aoDC$b_BYcuTjm!$ks}oRsP3d$sC;UT3B)W zsg%O*>2<84rN^uEj!t`~s%*;KclZ^WXYMof|!el!7eDVc?VY1H#S{3Qu zh{zs>WX!{dnHgzWVjEIWP_dGTOn}76)Oaw_v9XL9nG~P8_j!G0dbD>OuHRUbKB9CI zz{HRiEj}X^D29AaQc{+5rprd`c`9>IEVFM`lQ7)hBH1HNtjMooYZROfw#ykz0};m1GNk{0{0^)TJ19gwIc1XM|XEebE)tQ7Q)EYuP2<+toIX^JtabF zRh<=zRU_jE$;98#Zz#x_tneHSx69ryf#)vs8fSTlp^Y@yLWdEWX{(4rw58j_&eMoH zR3fI}{bimS`Hq8z(OdE~_4jIBeXYju7i((x9fW9bRiz@kD!Cx0epb~$ z?V((|#l|$>Rv|WrIM0mw;0nyWL$XNp7K^1Pnp`_YF2Gdd@h*C_2i7+FdpB+FfLguq}^5M3;xb;ofgATa4NEv@+)@ zbof!b`i_1)262jZt1`R;nOX=H*9r!^WQP1NOk!A6B{VvxH$Nc=NNzF&?@trLvQ+10 zk9_76$gZ)4N(r+eV1T3{B*4jUgocHP0ES=K*GDMUis7oTVPUy&w}cSIg@KAA1S!{b zDHK9pBSXCe!gXS)b4X~GJ6OwS$r7;H=w5FM8Z=p53?lB`#Q?akU!C75RM}Y8Y8pwC z_OZ46W*_3D;P7zdc-H{rysPR&Jq#)BL7N(`gd znKwC-l%*voa6rNxs&s8By`D){ZhI(a+HV?|r-aK1e37m0I7T#~32dtM==(GWnVL-z!(@ zJ2$s~zgf%tV*L0%{-v{T{IGVmZkylp&AR+@^KbvTJ88qNr5Og>4AS=o;LP2d)bUA# z`DO{g#^i~av@i>s3OLk9U1YImuq2P4oMJ5Ls9Nb=bC=gyddlG0w7~`^(1Le}W|1pc z$Oxm=t#@azqrcx8*v)Oq#Hv;Sr)FWy$ZQ*I8%$&7u~rU~F6G`clt(P| zMT1(rw1#Qgu@G#MxoVd*O=>4nDqToL>hdo>@$PpumFx`3`^KCK@E}O)mgpcwlB!Qaldx=I_V9zg|9CE0<&|V94@{r{b84(De z;lm-9Q-X+S6?AO*ieUu?SVC}|B$_gn>61l0xh>fU4?OuAT1cVW-}RO3iq_+BSDOj^p`d#Nf+)w;HJeXB#V%X zT-0+}a;9%JUSDDXSy+TQ>>dt@YMoJnO7LuwLa0=%9wsR@Btly>kgkN-#t#e{aS*NK z$t>jT#=x+!i4-Yl>B(ki@Z1Y~0U15?uK}j$LDneZFr88@&A@zxvvy_?ztd>JxHycGp&RVQe6wk$iSR~o4>rPj+ zlniak3CosIHH+X%JCW)VV7RNN(T4*^jL0KkKS()gNjQ|G-fA#H00e+Q2m*kh z00H0(o_mjq_gLcSaM3j$o!Xv)j(2VYliPGYfOLJn5-Bt!#F>hp>S}va(wkI%MK;l; zJ*K9no`8)2JwfC~MvTcbQR-;@NDK_7jZHLZqGXv&G!sFf9-tZk!~g&Q001-qDxM0O zU;vmVCQnldiGT>gFe4@am;o3GlT8emBuEk_)YThmZBxp6nLP=bo{8liq3R3(MuwiI zN25qR44}xwG-UM#)TGpSMAJYLM36m307 z^o=yo28}c{(?Ifp>KbSn8UX%D5fY0QJck7P2nA^PbhM@%WZrHJ!!bPj!b`b?$=y2% zhu!gqtw01QOaPOg-p?fJWVqNW*U54-97_sj6-G7co0!2fe0LSrg` zVfjB5irnW8#$*l8r{PMpR16yCG=kO`LO(yV@?8;XXkMkWGN7^%O;%E{n)0+#ldBew z1g|j51n{YTxKVAZU5=d+sPluXS6Z|eFl^qoD{ELI+a|%Hc753oq^9hpGj!ROqB4IK zB6vn`N3Hriz=U|vBqowc4U9NINuWsq{MqAaAnRfSK0L5D@HtIntm&u5b_|in%LQeB z54@RW_VP*MsM#fm~;)=_#Tl^;uMluE7l)#?cws98-cE z!T`^(Fs7>(#)8%g{P1;eI})5iS+KbsO!G4TX(a66loTq-L?%FC<6211iJFRbCb3Dt+ia<-XCZTy zW^wP2&&j9q!X-aWz3%E8t-oK3GD9jpFO#lB&IaNXlB$B?ljS)Beg)Ycp>gOk!myw- z0Cq|YbY)A!!|Z6f5Qq+Vfmaa9<4o@Yt06#f0t%0{0%u*9nlWGkgP~MmuT#otOJOT<=qM9X zr0i8JqDRONkAb(C+EI}+8Obxw71G@uMbzDSxO4It`R;;OTxvC5Y0G(Z zhck$#x`sxnmxv20Tu3Z>#*oGZ#krPEEvX?w+qyg~_>T_$?!NbvzRRCN@$ix1G{mug z4Ub2lu<^U27u?0iqX4jJV!3g-Xq6K25UpYev)%a#I2!GwTwqeQJ6CK@wH!8r+J>!0 z;|9g>VGPAIw|dUAIjZg3y-_@&&d=FNps^gjS}x<5_qE7hz7@!m{vFKgYtE~srq=U5 zZ0QD|UXMpa@RUbgw8;>*sy1TYs_d9%5*pkiS2tTbDN8lx?~$?HTfS{cd+7w&TIum- zQd#!`7dJO#DtwQ)$cWcoEI1B@dCw*Sn`p_BwxS_pfGeErx!TsaM2g;tBz74Jsp`@7 zxXSgH<9li1^G>d$9>mj8Ew3*(CGEMoS#dY8F8cPXDRp=1nweqq{3>Zh2%1v5$_I4| zb1@hg(|w49+HC|i3@)K-UEAn=Rut)3NiysVX`!+(Jl(G9RX)NAo3xau;mRzD1e)Wv z0)q_3m4iYpWL!j=cn7``UgZewbGTl>r|nww=78^g-E(W zG1k?RV^&^4j-Ld%P<6r}!Y(9=uOj9sbtRBv1>pKx@~<)I1nacFg2_}lLKa(Ak~qe% zRs%vd3L@hK5yfC~F4oY}Z6SkT#4`eLaRWygJU}E!QIYEnGsD7y6r9YH0#Sr@P_!hs zE;f?sJf??f|n(%G+=(&{8}K(u+1B)lE}2GePB*ksSQnX8n$ z&+#KK?m{^+8HQ+4q}Bi+)d3>E0Z8xLCBrOJF|JCXff0vqb7-Ju8tnp)A5vkBEE+A_ z;WouGzQTCYBwDQ+Okpr+gvAM95Gf?u0lt2lcR5CYuo?9jRQB92aDo`Om=}oIg*$4> zMG%*S%=93bPK;D7X$=y`iHxpXaVm|TD~+LHn?+Ty!Y%FCSOujzy&kf{hLnwF14%M| z*1jnPpN`TSE3r)Zg~Om2H0%;nGKU-1M(I^6|+*;gI>5> zu8+8x%vr6gH5a9HV}PYW%O7biWW4pzF;I(_&?=ZP4>7dce*%;{Fe&Y{7~Q0x)gHvj zxy+QMDJesO1`T`D|I<0j)Q?oM>p|;y&%xnh-Jn&d+)-sWp_UE3dR+zyPXMEK0ZTtUc)90+e z*k|fx|2+pE^^f%6{JB=m-}=$&d)$~kF*fx0Z1=bS{m)i}y6VW#ZLze!P}DWKX1aHi z3G_{wz{cc>oeCQw>B5hai0rG@CTapm;YlJ4mXK>%t8;aYTvG5aS|}hyaL_wEE!34p zLPBZvw6E;vD(m&fbZ+bwt18O@(%T@~8wT43(-{g4qU09Mt$RE1RStt!J-x>uj!EW< zhP82749~SCSzu%TbF#h+VQ$9HJw=5Q_&6 z84S!$3L&6Y?pMkwgcKQ46NKR;(R{8 z@D%2B4z4?iqV!@&gvJAOatVPE1Sv3s1T1EB7W8oMl24B*N=s2GG3)F>;yvFV=vdE$ zluf^gl**W`6nUlrONt_NA!LVB2@pI)2}IMhku)Clj@r;xO8zisi=t#j;f^$kcD-&7 zw9&D|xV>tfexwbasp?`G^>4tnAlz<6p0;?~&FVn+-7PRK(eVgskmw`W!xJtHHWd7OrcNxpIIk|9GN=M$okNz7Mr z`bl$6mj?9UB%r9K!WD$6*@S{3Qgfg%+e)SoU@5^2E5L9>Fd-K(4v+{98W;_XMJWWy z$(aMX94govB!ziPA_owdoYXO~h-hi14V4ScspuNT1&NXm*{Lq@q<}J32;^F-j$Ibj zmZI_eAH&UVEGua)F*ID5dg{*BO$Jt=y48yHm7yhQsm^1FCC^j9_e4d!QY!6fMn!=V zdn2TztPI#7V*rLiL6J|Mi|iEu@ixzg!!XEbS3b-wz+}@EiLng>>5(_kTG*YEF4%#= zW{Oft7NHfjsNYq{nY6;<>W~Vmq#@5i-t0>W(HEq#4y2H*7A*inP>4&}Nec)~j9~Ym z%TkMBG?#J8+1f6~BL!kxIWW>*&hXvZ6fqW|o}AHmmj;eQi0ccwR|{IIS8}FlBH0@N zSwXCn4xsIJAgaVD3Q2$|SqXB&l+GtWLEIw5o`}#)0$en$yjwWd&7Oio2^kheB8Ch% z&6rteY6dpt1m%`dHHqhvjVRb8!Dy>baErw}nT6&X`pHUAC=U7`re;4GGC(G>K!1z5 MBAh5lO!P=bfW=6>X#fBK From 690d731424ef05364b14ed89d9ed5e34964d0886 Mon Sep 17 00:00:00 2001 From: Richard Martin-Nielsen Date: Mon, 6 Jun 2022 22:48:32 +0300 Subject: [PATCH 5/5] Update all_country_data.rda --- data/all_country_data.rda | Bin 3065 -> 3043 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/all_country_data.rda b/data/all_country_data.rda index ce13307ca2b6dc0f6bbd7278552ac795734a9721..06a68019418dbdcddf19eb6b064529cf10690ca3 100644 GIT binary patch delta 3040 zcmV<63m^3P7vmQWLRx4!F+o`-Q&~T52ltT%fS4 z0003blR-2Dz?)4ewKh#t)6tU(o~D`%n@|Q%QKyu8fwamtlWJ+bP-p`}H8WEtiKLiM zAV2^B13{nw00000&;V$eRQ*%bZ6WGtXaH%T^)xil001-q7=fc8003wtNi-zcO(W4g zL4Tt|A(KD`fB*v^4FC*)00TpS0001J00003L7)Ht0AvB603=9_0Ga@r1SI@Glhaet z9-z}e$j}CXvP~YLrkWWV15cO*Ain&wgjmp$Jv$Qq4}(z0@xpC3w^>97y`hw7W?Nk! zEH7bkC4?cQkVdE8prCrTyv-P*`RZxVgny74cf6hMzpqTP<@Q0clXoA)#U@ZPm<%5% zX56mNcWX(UH+8J+{y)S6Zx)bsWwSKe@Nkm3C59bk3Fp$^3Q1?|+Qm zm!m!**1!?sK#-aM6GI4S5sm;!@zYhh$f!rH2fnvcLC8CETvY=Tm$ia}PEBI+1zZYNhbobkjEd5{A=K$Te3 zwX_squFm&sdDN8R63vB(>1Umndw)qNJe#FidUEB2%ysm2Q4NB?+2(^h>jck4WDi3! zW?`J!V>K#iLuyJ1l(JC?kQiAwzAY)XHZg;32NpWBo7_l)V`jp#h)I&J_i#ChyK=+S}T+$j?(TE9y;PlYzF`X^hR~j(=9n+rmBF z`hF|oQ~CWqI*rxaqrsMB#z6Iay~z_en}||M)dhnm$Zrl8mSlQ`hi#QAt+;Dr?zqn^ z)jWwIS&m&&*zwf|Q4zqEp$$RCHJf+)XOzp8WF{YacP~tL8H9`=rl)E>4?D&JWu!_xL z`%7KgI2@+!XP~kRii`p*G?{K7#FpXZO3DyKi!0r6xO4T4Jr+SLEPpXExYNmTWQQ|R zUW-E`8J7qOtt=!JJp)K#fRK){3(~TZ6P2FD$TB&{>}0#5J+2&VNY~es!cm}N31xj7 z9k^>Jy6_BIEM41RE|;>e-)?x*MEirJqU2KK_((g9yU7+936;L>$}y{K?clDRdUG=a zFuV9eQ8digX>Bp)pMSkx?BsBVTOM@<1&HbL+PRV=+1wp|_)0vF?&8+By$V#TGSbJ% ztsu4+U$ad73s2l;Oh7qt#4{ASVqOwggaa;N*(zqSaE3Nso^jfKwd3^e!KomN3oYLk zr3Eekb&T2ICvJw~Vd6IzJ{$!}V?Qhe)zOzMmeA@wz?AD^$A5Qf!13!#$RCY|Pd9GY z8$K4=Uwz%?#nl?PkXec=Q0#ep-4}P_>}bTzj9klZMGfv5;+hwHzWRz0IppwHQi0bp zt<{CbG~ZewHk&~WLki|qRejE0eL|vi%1M>nV@(Z_apCrS2~u{5C_M9&rs2vb5(zbp zR0SgpL8UQ*Dt}~FK_;Eh?*x{7$9+EKd)=E5BEs|$s-WJx8$(I7h7G2W+HE2f2|SZ1t$#qXFc zvT9l2*V77TTk(@QO0#OLOOmoMyi%-k!`e$hFGae81qiWuOH&2`=Qf)z;u_Hw0B*UE z4!H6#L1t2gHBg9%gp4)@0|3i?Vd74`q$HIV)eTe3t2pOP2TMiz)eQO!ZlWkmEub(s z`+piOszGih>_updCz?{ZBH0T4hZXvY!K%3#h}o4K9w_p77oi~n8AAGLqYcrJ8KAaP zY>xVplhLvj6Yl{FA|^-*oQj1qNMYYg+8o#LZR_oLCxyUlMtKv|H({-7v%d-;JQZk` zyUO{JOGsdY1QnGng0}T_XeVmXY2ck%n12low%Zm_r8w@qDAUW7Yvfd-I6J*BKF5K>|^pd1Hdrmc(%hq!9<#^kg2C+Gk@{Im~Jxe8d2@mT(q3!YeBCKe6ahEwpOqr6wj>kii238Lg+NQA}%b-4tm;7s zr70{)NsmWR9s}}tz2%1VwF_OIxM(r!Mp{}(tr8}c%oN6fTSX+L6Hbyu(0J&6Wyq+O zJ;2;AVAza9L~|1SygqMm<9|ZBuk27Z^SEX-ndt>=8#GAL3w9tvcO?+hfS6GvUb{vB zLox+G3;nrq?7F)c4D@>@6~hQ@8C;Qfv>E~rBzVgskow|{4D{e9yjoOzrL zDM`L@?2;ivAmp9a}pb;(DiMJyh=dol}uju_w@5 z6Y6d&E}4o_DJZI<36qmD2V^)_)EZJkxUQ&y#3m;-3~XW=8fk-Np>eT2A)ruHnIQex zrP3)N43$DRtZhdom4C5iiE#c8OpG2D+MIL6sm-|AxdVaSRnEUsVYP% z30g+8y{k%d(=t>Hsu86zEL%U+)6p4$Vr0YsXs9oihD0H iF2~wO0@Bs-f4)(*|5(8!KM0cl;_gVN3K9qH!2aMR@_m~C delta 3062 zcmV-0E{L807FIuU;vB&0wJPmdYJ(B4m&5v)Qb2cMGll&=Pl9Oz1C^loHTk{Y zxBI>WEH^R^sW)fw8_E+IQvhN7CF^tx^M@P769FsOT>=dNiW8Jb1QL--V$aHP4!}7T zX=E8T0z?Tycnc^51aoDC$bB+|?&)=`=cf>$<$e}2y~x*E-z#T5 zh1cr9*NypI8P^j#sZ8>Ue}-G-cYh^@H@tdp5jKG9plYsETbc`)EHu>Y-jqsl324If zb+gROJ*1P2`vq#9SnE4LQ9)@Jh!-ts}X<1?$QczH_l88)z z#L3inFwwEGj2W2}pSt&XeP(*JcO0(YSd%`YbP~YCkQOaIBNZryd`?nQmVb1n%SP;Z zDsxaQvu{?DFx=lF*&|J?$gg5+6r2sV%Nb1NFLJcbPH6ocyFZqwl>TRT$3ul}uh7pz zV<3BeKKzNCP6R0>Wd-9W&T@w~qWsTHyzerKmcV=o^TFxi$3NJT7W=UEFx~HK2+NF{ zTSK3M@5yDaS5KsTtt*qplYcFVjU=Lna%3*@g?ekFuLFH9F49KpTM(Val_rO;9ar2L zX>19gwIc1XM|XEebE)tQ7Q)EYuP2<+toIX^JtabFRh<=zRU_jE$;98#Zz#x_tneHS zx69ryf#)vs8fSTlp^Y@yLWdEWX{(4rw58j_&eMoHR3fI}{bimS`G1ashU4Eag93&j z7n=toWOrm!7eYgX|@ds^eJ-3o)q{@yOdwficGS7n)xld&Mu3y;&Pc}q{%W=udi zazrx{^+dSJj|c`_tR$=4TXOKS&4x)bbu10(H|oS?#p`EpuJXEN&_5waLcVHRV%O0Nw5#!xItpmjGB8T` z$55qF%O7biWWD=s3{)cZ>Xu9x2bknH;l!;@%|(62gB$ir45QbXH#w4&r6nkEK*AlW zbboCry`D){ZhI(a+HV?|r-aK1eN_{Lf4^DF{9^q0 zKK`Y%Z~U-!wr-o>^Ub>aa`SKhxjSjYuB90U+YHk82H?!yo7C}1g!yI(z{cc>nSZn} z3!4f!)JI)pv1hO(kDr`kEa|9P>0NV|*I9bX;Mugn1}D&hcZg<@D_F<~qt&fZOX)|RspAGVa&*E8*Cd)WGFX_lv}s8^!c$?4wEkB-ZPX(Ec8W#TD-J|Y1*+6 zY?8TZmo!akCsHb1NJZ-MFFx_^cYigN>an_;ZxQ6{R$S8U%5 z`|ze54EyH9dzCPD7BcM?RYdZpF*=P>KamD6Bg+W z1d-QU(&ebONH8`P@v>?3URNN6bi+Jg&o7-Ea;Ut}UJG>ckmV5>5eT5+!+#-{Q-X+S z6?AO*ieUu?SVC}|B$_gn>61l0xh>fU4?OuATaq61oRa$!mm0vnEBr>C|-v=s!dJW`7^qZ^SW6P!Alz z`Z_i=Q6r-dMbZ$+-hl4;xi|NA$tkC$@Lx*>|7#`zIoni9VvyKE~pv6EaFg(uz=mWaP}j-wqY18xlgm zts(~yn4Huxv507Crhg5V3=Qe*4Pt_ck`LKxPXZQJFxAJ<-%wR1F$HF`yxk zkY-oaMido5^jl}c;+SSME8k|TwG5hKqHIGz`lL>dt@YMoJnO7LuwLa0=%9wsR@Btly>kgkN-#t#e{aS*NK$t>jT z#=x+!i4-Yl>B(ki@Z1Y~0U15?uK}j$LDqlie@TD_rs3G-