Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

report mode when simulation error occurs #329

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5e31819
report mode when simulation error occurs
rtesra Aug 11, 2022
8997863
add tests
rtesra Aug 12, 2022
9c20f6f
WIP: fix tests
jeffeaton Sep 3, 2022
7d1fb14
Merge branch 'master' into report-mode-when-simulation-fails
jeffeaton Sep 3, 2022
0a2a8fc
Merge branch 'master' into report-mode-when-simulation-fails
rtesra Sep 12, 2022
d6bf789
report mode in place of mean
rtesra Sep 12, 2022
edbe2c9
add comprehensive tests for warning and move from test-model-fit -> t…
rtesra Sep 12, 2022
1c6c38b
add more descriptive class names for indicators dataframe
rtesra Sep 12, 2022
d3e7a32
Merge branch 'incidence-projection' into report-mode-when-simulation-…
rtesra Sep 12, 2022
68b399a
Version bump
rtesra Sep 12, 2022
03db920
Merge branch 'master' into report-mode-when-simulation-fails
jeffeaton Sep 15, 2022
a64ad12
redocument
jeffeaton Sep 15, 2022
4442b7a
create art_attendance df with NAs in sample when mode is reported
rtesra Sep 21, 2022
c9dab8d
Merge branch 'master' into report-mode-when-simulation-fails
rtesra Sep 21, 2022
84fcf43
version bump
rtesra Sep 21, 2022
c2de3bb
don't calibrate missing columns when mode indicators are returned
rtesra Sep 22, 2022
f3c2266
fix test uncertainty warning
rtesra Sep 23, 2022
4107dd8
Merge branch 'master' into report-mode-when-simulation-fails
r-ash Sep 28, 2022
c3112cf
remove merge conflict flags in traduire
jeffeaton Sep 28, 2022
d8886c2
Tidy merge conflict in NEWS
r-ash Sep 29, 2022
d32a2ca
Merge branch 'master' into report-mode-when-simulation-fails
rtesra Sep 30, 2022
ccfdb1c
Error when invalid mode values are calibrated
rtesra Sep 30, 2022
ffbcd0e
fix error in test
rtesra Sep 30, 2022
05aac99
Update calibrate.R
rtesra Oct 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
report mode in place of mean
  • Loading branch information
rtesra committed Sep 12, 2022
commit d6bf789bd0bc0e9d8b456c6aed9799b2f8c693fc
9 changes: 4 additions & 5 deletions R/outputs.R
Original file line number Diff line number Diff line change
@@ -448,15 +448,14 @@ output_package <- function(naomi_fit, naomi_data, na.rm = FALSE) {
naomi_warning(t_("WARNING_NO_UNCERTAINTY"),
c("model_fit"))

# If error in simulating outputs - remove sample
# If error in simulating outputs: remove sample
# and return mode for all indicators
naomi_fit$sample <- NULL
extract_indicators(naomi_fit, naomi_data, na.rm = na.rm)


df <- extract_indicators(naomi_fit, naomi_data, na.rm = na.rm)
df$mean <- df$mode
df
})


art_attendance <- extract_art_attendance(naomi_fit, naomi_data, na.rm = na.rm)

meta_area <- naomi_data$areas %>%