Refactor `summarize_change()` #1347

Melkiades · 2024-11-04T15:13:22Z

R/summarize_change.R

vignettes/tern_functions_guide.Rmd

pawelru · 2024-11-05T09:07:18Z

There is a bug in R CMD CHECK workflow logic. Sorry about that. There is a PR to fix it: insightsengineering/r.pkg.template#261

github-actions · 2024-11-05T09:21:51Z

Unit Tests Summary

1 files 84 suites 1m 13s ⏱️
870 tests 859 ✅ 11 💤 0 ❌
1 867 runs 1 171 ✅ 696 💤 0 ❌

Results for commit 4f3b5fd.

♻️ This comment has been updated with latest results.

github-actions · 2024-11-05T09:21:55Z

Unit Test Performance Difference

Additional test case details

Test Suite	$Status$	Time on `main`	$±Time$	Test Case
summarize_change	👶		$+0.18$	summarize_change_works_with_custom_statistical_functions

Results for commit caaae34

♻️ This comment has been updated with latest results.

…ghtsengineering/tern into 1345_refactor_summarize_change@main

Melkiades · 2024-11-05T16:43:23Z

@pawelru this is the current error:


! Failed to render 'vignettes/tern_functions_guide.Rmd'.
✖ Quitting from lines 65-87 [unnamed-chunk-3] (tern_functions_guide.Rmd)
Caused by error:
! could not find function "get_additional_analysis_fun_parameters"

In the vignette this function is not present though. Am I missing something obvious?

R/utils_rtables.R

R/summarize_change.R

shajoezhu · 2024-11-06T01:21:38Z

@pawelru this is the current error:
! Failed to render 'vignettes/tern_functions_guide.Rmd'.
✖ Quitting from lines 65-87 [unnamed-chunk-3] (tern_functions_guide.Rmd)
Caused by error:
! could not find function "get_additional_analysis_fun_parameters"
In the vignette this function is not present though. Am I missing something obvious?

it's the function name, I think you can replace this as get_additional_afun_params @Melkiades

shajoezhu · 2024-11-06T02:54:35Z

Error applying analysis function (var - CHG): could not find function ".split_default_from_custom_stats"
occured at (row) path: AVISIT[Baseline]

shajoezhu · 2024-11-06T03:02:16Z

hi @Melkiades , can you please update the DESCRIPTION file

--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -144,6 +144,8 @@ Collate:
     'h_survival_duration_subgroups.R'
     'imputation_rule.R'
     'incidence_rate.R'
+    'individual_patient_plot.R'
+    'kaplan_meier_plot.R'
     'logistic_regression.R'
     'missing_data.R'
     'odds_ratio.R'
@@ -166,6 +168,7 @@ Collate:
     'summarize_glm_count.R'
     'summarize_num_patients.R'
     'summarize_patients_exposure_in_cols.R'
+    'summarize_variables.R'

and rerun roxygen

Melkiades · 2024-11-06T10:45:33Z

hi @Melkiades , can you please update the DESCRIPTION file

--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -144,6 +144,8 @@ Collate:
     'h_survival_duration_subgroups.R'
     'imputation_rule.R'
     'incidence_rate.R'
+    'individual_patient_plot.R'
+    'kaplan_meier_plot.R'
     'logistic_regression.R'
     'missing_data.R'
     'odds_ratio.R'
@@ -166,6 +168,7 @@ Collate:
     'summarize_glm_count.R'
     'summarize_num_patients.R'
     'summarize_patients_exposure_in_cols.R'
+    'summarize_variables.R'

and rerun roxygen

roxygen2::update.collate(".") does not apply any modifications in my local (there should not be any difference in source files afaik)

github-actions · 2024-11-06T16:07:49Z

Code Coverage Summary

Filename                                   Stmts    Miss  Cover    Missing
---------------------------------------  -------  ------  -------  ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
R/abnormal_by_baseline.R                      65       0  100.00%
R/abnormal_by_marked.R                        55       5  90.91%   93-97
R/abnormal_by_worst_grade_worsen.R           116       3  97.41%   263-265
R/abnormal_by_worst_grade.R                   60       0  100.00%
R/abnormal.R                                  43       0  100.00%
R/analyze_variables.R                        166       2  98.80%   486, 626
R/analyze_vars_in_cols.R                     176      13  92.61%   178, 221, 235-236, 244-252
R/bland_altman.R                              92       1  98.91%   46
R/combination_function.R                       9       0  100.00%
R/compare_variables.R                         84       2  97.62%   257, 316
R/control_incidence_rate.R                    10       0  100.00%
R/control_logistic.R                           7       0  100.00%
R/control_step.R                              23       1  95.65%   58
R/control_survival.R                          15       0  100.00%
R/count_cumulative.R                          59       1  98.31%   74
R/count_missed_doses.R                        36       0  100.00%
R/count_occurrences_by_grade.R               157       2  98.73%   177, 271
R/count_occurrences.R                        116       1  99.14%   120
R/count_patients_events_in_cols.R             67       1  98.51%   60
R/count_patients_with_event.R                 62       1  98.39%   123
R/count_patients_with_flags.R                 95       1  98.95%   134
R/count_values.R                              27       0  100.00%
R/cox_regression_inter.R                     154       0  100.00%
R/cox_regression.R                           161       0  100.00%
R/coxph.R                                    167       7  95.81%   191-195, 238, 253, 261, 267-268
R/d_pkparam.R                                406       0  100.00%
R/decorate_grob.R                            113       0  100.00%
R/desctools_binom_diff.R                     621      64  89.69%   53, 88-89, 125-126, 129, 199, 223-232, 264, 266, 286, 290, 294, 298, 353, 356, 359, 362, 422, 430, 439, 444-447, 454, 457, 466, 469, 516-517, 519-520, 522-523, 525-526, 593, 604-616, 620, 663, 676, 680
R/df_explicit_na.R                            30       0  100.00%
R/estimate_multinomial_rsp.R                  50       1  98.00%   65
R/estimate_proportion.R                      205      11  94.63%   83-90, 94, 99, 320, 486
R/fit_rsp_step.R                              36       0  100.00%
R/fit_survival_step.R                         36       0  100.00%
R/formatting_functions.R                     183       2  98.91%   141, 276
R/g_forest.R                                 585      60  89.74%   240, 252-255, 260-261, 275, 277, 287-290, 335-338, 345, 414, 501, 514, 518-519, 524-525, 538, 554, 601, 632, 707, 716, 722, 741, 796-816, 819, 830, 849, 904, 907, 1042-1047
R/g_ipp.R                                    133       0  100.00%
R/g_km.R                                     350      57  83.71%   285-288, 307-309, 363-366, 400, 428, 432-475, 482-486
R/g_lineplot.R                               260      22  91.54%   204, 378-385, 424-434, 543, 551
R/g_step.R                                    68       1  98.53%   108
R/g_waterfall.R                               47       0  100.00%
R/h_adsl_adlb_merge_using_worst_flag.R        73       0  100.00%
R/h_biomarkers_subgroups.R                    46       0  100.00%
R/h_cox_regression.R                         110       0  100.00%
R/h_incidence_rate.R                          45       0  100.00%
R/h_km.R                                     509      41  91.94%   137, 189-194, 287, 378, 380-381, 392-394, 413, 420-421, 423-425, 433-435, 460, 465-468, 651-654, 1108-1119
R/h_logistic_regression.R                    468       3  99.36%   203-204, 273
R/h_map_for_count_abnormal.R                  54       0  100.00%
R/h_pkparam_sort.R                            15       0  100.00%
R/h_response_biomarkers_subgroups.R           90      12  86.67%   50-55, 107-112
R/h_response_subgroups.R                     178      18  89.89%   257-270, 329-334
R/h_stack_by_baskets.R                        64       1  98.44%   89
R/h_step.R                                   180       0  100.00%
R/h_survival_biomarkers_subgroups.R           88       6  93.18%   111-116
R/h_survival_duration_subgroups.R            207      18  91.30%   259-271, 336-341
R/imputation_rule.R                           17       0  100.00%
R/incidence_rate.R                            86       7  91.86%   67-72, 152
R/logistic_regression.R                      102       0  100.00%
R/missing_data.R                              21       3  85.71%   32, 66, 76
R/odds_ratio.R                               117       0  100.00%
R/prop_diff_test.R                            91       0  100.00%
R/prop_diff.R                                265      15  94.34%   70-73, 105, 290-297, 440, 605
R/prune_occurrences.R                         57       0  100.00%
R/response_biomarkers_subgroups.R             69       6  91.30%   196-201
R/response_subgroups.R                       213       8  96.24%   100-105, 260-261
R/riskdiff.R                                  65       5  92.31%   102-105, 114
R/rtables_access.R                            38       0  100.00%
R/score_occurrences.R                         20       1  95.00%   124
R/split_cols_by_groups.R                      49       0  100.00%
R/stat.R                                      59       0  100.00%
R/summarize_ancova.R                         106       2  98.11%   183, 188
R/summarize_change.R                          74       1  98.65%   184
R/summarize_colvars.R                         10       0  100.00%
R/summarize_coxreg.R                         172       0  100.00%
R/summarize_glm_count.R                      209       3  98.56%   193-194, 490
R/summarize_num_patients.R                    93       4  95.70%   117-119, 266
R/summarize_patients_exposure_in_cols.R       96       1  98.96%   56
R/survival_biomarkers_subgroups.R             78       6  92.31%   117-122
R/survival_coxph_pairwise.R                   79      11  86.08%   51-52, 64-72
R/survival_duration_subgroups.R              211       6  97.16%   124-129
R/survival_time.R                             79       0  100.00%
R/survival_timepoint.R                       113       7  93.81%   125-131
R/utils_checkmate.R                           68       0  100.00%
R/utils_default_stats_formats_labels.R       145       0  100.00%
R/utils_factor.R                             109       2  98.17%   84, 302
R/utils_ggplot.R                             110       0  100.00%
R/utils_grid.R                               126       5  96.03%   164, 279-286
R/utils_rtables.R                            124       9  92.74%   39, 46, 403-404, 526-530
R/utils_split_funs.R                          52       2  96.15%   82, 94
R/utils.R                                    141       7  95.04%   118, 121, 124, 128, 137-138, 332
TOTAL                                      10736     469  95.63%

Diff against main

Filename                                  Stmts    Miss  Cover
--------------------------------------  -------  ------  --------
R/summarize_change.R                        +44      +1  -1.35%
R/utils_default_stats_formats_labels.R      +21       0  +100.00%
R/utils_rtables.R                           +24      +5  -3.26%
TOTAL                                       +89      +6  -0.02%

Results for commit: 4f3b5fd

Minimum allowed coverage is 80%

♻️ This comment has been updated with latest results

shajoezhu

hi @Melkiades , the CI test is still not passing

can you take another look. thanks!

a_change_from_baseline: no visible binding for global variable
  ‘.df_row’
a_change_from_baseline: no visible binding for global variable ‘.var’
get_additional_afun_params: missing arguments not allowed in calls to
  ‘c’
Undefined global functions or variables:
  .df_row .var

shajoezhu · 2024-11-06T23:03:16Z

hi @Melkiades , can you please update the DESCRIPTION file

--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -144,6 +144,8 @@ Collate:
     'h_survival_duration_subgroups.R'
     'imputation_rule.R'
     'incidence_rate.R'
+    'individual_patient_plot.R'
+    'kaplan_meier_plot.R'
     'logistic_regression.R'
     'missing_data.R'
     'odds_ratio.R'
@@ -166,6 +168,7 @@ Collate:
     'summarize_glm_count.R'
     'summarize_num_patients.R'
     'summarize_patients_exposure_in_cols.R'
+    'summarize_variables.R'

and rerun roxygen

roxygen2::update.collate(".") does not apply any modifications in my local (there should not be any difference in source files afaik)

weired. when I run locally, these get added, and after that, more document rd files get rendered.

shajoezhu · 2024-11-07T02:15:33Z

hi @Melkiades , can you please update the DESCRIPTION file

--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -144,6 +144,8 @@ Collate:
     'h_survival_duration_subgroups.R'
     'imputation_rule.R'
     'incidence_rate.R'
+    'individual_patient_plot.R'
+    'kaplan_meier_plot.R'
     'logistic_regression.R'
     'missing_data.R'
     'odds_ratio.R'
@@ -166,6 +168,7 @@ Collate:
     'summarize_glm_count.R'
     'summarize_num_patients.R'
     'summarize_patients_exposure_in_cols.R'
+    'summarize_variables.R'

and rerun roxygen

roxygen2::update.collate(".") does not apply any modifications in my local (there should not be any difference in source files afaik)

I think I know why now. I use devtools::document(roclets = c('rd', 'collate', 'namespace')), and I run with roxygen2::update_collate("."), this get updated.

I am using roxygen2 7.3.2, what version do use at the moment @Melkiades

shajoezhu · 2024-11-07T02:45:17Z

downstream works ok https://github.com/insightsengineering/scda.test/pull/161/files

Melkiades · 2024-11-07T18:48:11Z

roxygen2::update_collate(".")

I do have that version but those files are not present in R/

shajoezhu

lgtm! Thanks @Melkiades

Melkiades added 3 commits November 4, 2024 16:11

rework of summarize_change

368eb72

fixes and vignette

a5b6df9

trial

241e9a5

Melkiades added bug Something isn't working enhancement sme priority labels Nov 4, 2024

Melkiades commented Nov 4, 2024

View reviewed changes

R/summarize_change.R Outdated Show resolved Hide resolved

Melkiades commented Nov 4, 2024

View reviewed changes

R/summarize_change.R Show resolved Hide resolved

Melkiades commented Nov 4, 2024

View reviewed changes

R/summarize_change.R Outdated Show resolved Hide resolved

Melkiades commented Nov 4, 2024

View reviewed changes

vignettes/tern_functions_guide.Rmd Outdated Show resolved Hide resolved

shajoezhu and others added 2 commits November 5, 2024 10:55

Empty-Commit

61f61c9

fix vignette

b56920d

shajoezhu and others added 2 commits November 5, 2024 17:10

Empty-Commit

8386dd9

[skip style] [skip vbump] Restyle files

3090db7

Melkiades and others added 8 commits November 5, 2024 11:30

final fixes

d972631

Merge branch '1345_refactor_summarize_change@main' of github.com:insi…

6a44ec4

…ghtsengineering/tern into 1345_refactor_summarize_change@main

style

1241ac4

lintr

513686c

fix

9f3afad

[skip style] [skip vbump] Restyle files

383ccc2

fix spelling

e4ccb53

Merge branch '1345_refactor_summarize_change@main' of github.com:insi…

9c0db6c

…ghtsengineering/tern into 1345_refactor_summarize_change@main

shajoezhu reviewed Nov 6, 2024

View reviewed changes

R/utils_rtables.R Show resolved Hide resolved

shajoezhu reviewed Nov 6, 2024

View reviewed changes

R/summarize_change.R Outdated Show resolved Hide resolved

fixes

c8a7e42

Melkiades added 2 commits November 6, 2024 11:57

last fix

bba6778

forgot

f3324d0

Merge branch 'main' into 1345_refactor_summarize_change@main

343845b

shajoezhu requested changes Nov 6, 2024

View reviewed changes

shajoezhu added the request changes label Nov 7, 2024

shajoezhu self-assigned this Nov 7, 2024

Fix last note

4f3b5fd

Melkiades enabled auto-merge (squash) November 7, 2024 19:19

shajoezhu approved these changes Nov 7, 2024

View reviewed changes

Melkiades merged commit 12de1fb into main Nov 7, 2024
29 checks passed

Melkiades deleted the 1345_refactor_summarize_change@main branch November 7, 2024 21:48

github-actions bot locked and limited conversation to collaborators Nov 7, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor `summarize_change()` #1347

Refactor `summarize_change()` #1347

Melkiades commented Nov 4, 2024

pawelru commented Nov 5, 2024

github-actions bot commented Nov 5, 2024 •

edited

Loading

github-actions bot commented Nov 5, 2024 •

edited

Loading

Melkiades commented Nov 5, 2024 •

edited

Loading

shajoezhu commented Nov 6, 2024 •

edited

Loading

shajoezhu commented Nov 6, 2024

shajoezhu commented Nov 6, 2024

Melkiades commented Nov 6, 2024

github-actions bot commented Nov 6, 2024 •

edited

Loading

shajoezhu left a comment

shajoezhu commented Nov 6, 2024

shajoezhu commented Nov 7, 2024 •

edited

Loading

shajoezhu commented Nov 7, 2024

Melkiades commented Nov 7, 2024

shajoezhu left a comment

Refactor summarize_change() #1347

Refactor summarize_change() #1347

Conversation

Melkiades commented Nov 4, 2024

pawelru commented Nov 5, 2024

github-actions bot commented Nov 5, 2024 • edited Loading

Unit Tests Summary

github-actions bot commented Nov 5, 2024 • edited Loading

Unit Test Performance Difference

Melkiades commented Nov 5, 2024 • edited Loading

shajoezhu commented Nov 6, 2024 • edited Loading

shajoezhu commented Nov 6, 2024

shajoezhu commented Nov 6, 2024

Melkiades commented Nov 6, 2024

github-actions bot commented Nov 6, 2024 • edited Loading

Code Coverage Summary

Diff against main

shajoezhu left a comment

Choose a reason for hiding this comment

shajoezhu commented Nov 6, 2024

shajoezhu commented Nov 7, 2024 • edited Loading

shajoezhu commented Nov 7, 2024

Melkiades commented Nov 7, 2024

shajoezhu left a comment

Choose a reason for hiding this comment

Refactor `summarize_change()` #1347

Refactor `summarize_change()` #1347

github-actions bot commented Nov 5, 2024 •

edited

Loading

github-actions bot commented Nov 5, 2024 •

edited

Loading

Melkiades commented Nov 5, 2024 •

edited

Loading

shajoezhu commented Nov 6, 2024 •

edited

Loading

github-actions bot commented Nov 6, 2024 •

edited

Loading

shajoezhu commented Nov 7, 2024 •

edited

Loading