Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
irdmalaria_painel_trif
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESPACE-DEV
lmi-sentinela
irdmalaria_painel_trif
Commits
9edd9468
Commit
9edd9468
authored
1 month ago
by
Vincent DUPONT
Browse files
Options
Downloads
Patches
Plain Diff
Modification du calcul des cas colombien
On ne passe plus par source, mais par pays d'infection
parent
32502351
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
functions/consultation_har_filter.R
+4
-4
4 additions, 4 deletions
functions/consultation_har_filter.R
modules/harmonized.R
+12
-9
12 additions, 9 deletions
modules/harmonized.R
server.R
+9
-6
9 additions, 6 deletions
server.R
with
25 additions
and
19 deletions
functions/consultation_har_filter.R
+
4
−
4
View file @
9edd9468
...
...
@@ -3,12 +3,12 @@ consultation_har_filter <- function(df, source = "Any", new_attack, dateStart =
# Packages
require
(
dplyr
)
# Modification du filtrage des
sources
# Modification du filtrage des
pays d'infection
if
(
source
!=
"Any"
){
if
(
source
==
"CO"
){
# Changé de "FG" à "CO"
df
<-
df
%>%
filter
(
source
==
"CO"
)
# Changé
de "FR-GF" à "CO"
if
(
source
==
"CO"
){
df
<-
df
%>%
filter
(
infection_country
==
"CO"
)
# Changé
ici
}
else
if
(
source
==
"BR"
){
df
<-
df
%>%
filter
(
source
==
"BR"
)
df
<-
df
%>%
filter
(
infection_country
==
"BR"
)
# Changé ici
}
}
...
...
This diff is collapsed.
Click to expand it.
modules/harmonized.R
+
12
−
9
View file @
9edd9468
...
...
@@ -26,21 +26,24 @@ HAR_sub <- reactive({
})
# Séparation des données par pays
# Séparation des données par pays d'infection
HAR_br
<-
reactive
({
HAR_sub
()
%>%
filter
(
source
==
"BR"
)
HAR_sub
()
%>%
filter
(
infection_country
==
"BR"
)
# Modifié ici
})
HAR_co
<-
reactive
({
# Vérification au niveau du filtrage initial
initial_data
<-
HAR_sub
()
%>%
filter
(
source
==
"CO"
)
print
(
"Données colombiennes après filtrage initial :"
)
print
(
paste
(
"Nombre de cas :"
,
nrow
(
initial_data
)))
print
(
"Exemple de dates :"
)
print
(
head
(
initial_data
$
consultation_date
))
return
(
initial_data
)
HAR_sub
()
%>%
filter
(
infection_country
==
"CO"
)
# Modifié ici
})
# Fonction réactive pour compter les cas colombiens
HAR_co_count
<-
reactive
({
nrow
(
HAR_co
())
})
# Fonction réactive pour compter les cas brésiliens
HAR_br_count
<-
reactive
({
nrow
(
HAR_br
())
})
# Création des tableaux temporels pour le Brésil
HAR_br_tab
<-
reactive
({
agg
<-
as.numeric
(
input
$
agg
)
...
...
This diff is collapsed.
Click to expand it.
server.R
+
9
−
6
View file @
9edd9468
...
...
@@ -57,23 +57,26 @@ unique_loc <- unique_loc.shp %>%
mutate
(
coords.x1
=
coords_loc
[,
1
],
coords.x2
=
coords_loc
[,
2
])
%>%
st_drop_geometry
()
# Séparation et traitement des données par pays
# Séparation et traitement des données par pays
d'infection
unique_loc_br
<-
unique_loc
%>%
filter
(
country
==
"BR"
)
%>%
mutate
(
infection_country
=
"BR"
)
%>%
filter
(
!
is.na
(
id_sivep
))
unique_loc_co
<-
unique_loc
%>%
filter
(
country
==
"CO"
)
%>%
mutate
(
infection_country
=
"CO"
)
%>%
filter
(
!
is.na
(
id_sivep
))
# Gestion des localisations qui apparaissent dans les deux pays
unique_loc_both
<-
unique_loc_br
%>%
filter
(
!
is.na
(
id_sivep
)
&
!
is.na
(
id_cdps
))
%>%
mutate
(
id_sivep
=
id_cdps
)
%>%
mutate
(
country
=
"CO"
)
%>%
mutate
(
coords.x1
=
coords.x1
+
0.001
)
%>%
mutate
(
coords.x2
=
coords.x2
+
0.001
)
%>%
mutate
(
name
=
paste
(
name
,
"(CO)"
))
mutate
(
id_sivep
=
id_cdps
,
country
=
"CO"
,
infection_country
=
"CO"
,
coords.x1
=
coords.x1
+
0.001
,
coords.x2
=
coords.x2
+
0.001
,
name
=
paste
(
name
,
"(CO)"
))
# Mise à jour des noms pour le Brésil
unique_loc_br
<-
unique_loc_br
%>%
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment