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

Added GridEven and GridManual #303

Merged
merged 5 commits into from
Apr 8, 2024
Merged

Added GridEven and GridManual #303

merged 5 commits into from
Apr 8, 2024

Conversation

gowerc
Copy link
Collaborator

@gowerc gowerc commented Apr 5, 2024

Closes #302

Added GridManual to allow for very fine tuned control and then GridEven which directly addresses #302 . These should help improve the UI when generating the required quantity plots.

EDIT

Sorry as a minor aside I rename pt_to_ind to subject_to_index to both be consistent and more expressive

Copy link
Contributor

github-actions bot commented Apr 5, 2024

badge

Code Coverage Summary

Filename                          Stmts    Miss  Cover    Missing
------------------------------  -------  ------  -------  --------------------------------
R/brier_score.R                     166       0  100.00%
R/DataJoint.R                        76       2  97.37%   264, 270
R/DataLongitudinal.R                119       1  99.16%   244
R/DataSubject.R                      69       1  98.55%   124
R/DataSurvival.R                     77       0  100.00%
R/defaults.R                         10       6  40.00%   18-57, 84
R/generics.R                         25       1  96.00%   51
R/Grid.R                             30       0  100.00%
R/GridEven.R                         32       0  100.00%
R/GridFixed.R                        24       0  100.00%
R/GridGrouped.R                      46       0  100.00%
R/GridManual.R                       23       3  86.96%   78-80
R/GridObserved.R                     20       0  100.00%
R/JointModel.R                      122       8  93.44%   142-144, 194, 198, 240, 286, 292
R/JointModelSamples.R                65       0  100.00%
R/Link.R                             55       4  92.73%   159-162
R/LinkComponent.R                    47       5  89.36%   100, 118, 132-149
R/LongitudinalGSF.R                  64       0  100.00%
R/LongitudinalModel.R                37      12  67.57%   70-85
R/LongitudinalQuantities.R           61       0  100.00%
R/LongitudinalRandomSlope.R          27       0  100.00%
R/LongitudinalSteinFojo.R            57       8  85.96%   113-135
R/Parameter.R                        14       0  100.00%
R/ParameterList.R                    42       1  97.62%   184
R/Prior.R                           236       8  96.61%   480, 576, 588-606
R/Quantities.R                       60       0  100.00%
R/settings.R                         12      12  0.00%    55-69
R/SimGroup.R                          5       0  100.00%
R/SimJointData.R                     72       1  98.61%   103
R/SimLongitudinal.R                   5       2  60.00%   22, 40
R/SimLongitudinalGSF.R               51       0  100.00%
R/SimLongitudinalRandomSlope.R       42       0  100.00%
R/SimLongitudinalSteinFojo.R         48       0  100.00%
R/SimSurvival.R                     104       0  100.00%
R/StanModel.R                        15       0  100.00%
R/StanModule.R                      179       6  96.65%   199-200, 242, 253, 390, 418
R/SurvivalExponential.R              10       0  100.00%
R/SurvivalLoglogistic.R              11       0  100.00%
R/SurvivalModel.R                    19       0  100.00%
R/SurvivalQuantities.R              160       1  99.38%   120
R/SurvivalWeibullPH.R                11       0  100.00%
R/utilities.R                       146       1  99.32%   13
R/zzz.R                              28      25  10.71%   3, 8-12, 14-35, 47
TOTAL                              2522     108  95.72%

Diff against main

Filename            Stmts    Miss  Cover
----------------  -------  ------  --------
R/Grid.R              +20       0  +100.00%
R/GridEven.R          +32       0  +100.00%
R/GridFixed.R         -16       0  +100.00%
R/GridManual.R        +23      +3  +86.96%
R/GridObserved.R      -16      -3  +8.33%
TOTAL                 +43       0  +0.07%

Results for commit: 18684dc

Minimum allowed coverage is 80%

♻️ This comment has been updated with latest results

Copy link
Contributor

github-actions bot commented Apr 5, 2024

Unit Tests Summary

  1 files   41 suites   7m 28s ⏱️
123 tests  92 ✅ 31 💤 0 ❌
866 runs  835 ✅ 31 💤 0 ❌

Results for commit d7ebf0a.

Copy link
Contributor

github-actions bot commented Apr 5, 2024

Unit Test Performance Difference

Test Suite $Status$ Time on main $±Time$ $±Tests$ $±Skipped$ $±Failures$ $±Errors$
Grid 💚 $106.24$ $-4.64$ $+9$ $0$ $0$ $0$
JointModelSamples 💚 $35.69$ $-2.56$ $0$ $0$ $0$ $0$
LongitudinalQuantiles 💚 $42.17$ $-2.04$ $0$ $0$ $0$ $0$
model_multi_chain 💚 $44.52$ $-1.64$ $0$ $0$ $0$ $0$
stan_functions 💚 $48.81$ $-1.86$ $0$ $0$ $0$ $0$
Additional test case details
Test Suite $Status$ Time on main $±Time$ Test Case
Grid 💚 $106.05$ $-4.72$ GridObservered_Constructs_correct_quantities
Grid 👶 $+0.03$ subjects_to_list_works_as_expected
JointModelSamples 💚 $35.69$ $-2.56$ print_works_as_expected_for_JointModelSamples
LongitudinalQuantiles 💚 $34.88$ $-2.00$ Test_that_LongitudinalQuantities_works_as_expected
model_multi_chain 💚 $44.52$ $-1.64$ Can_recover_known_distribution_parameters_from_random_slope_model_when_using_multiple_chains

Results for commit 67ca860

♻️ This comment has been updated with latest results.

Copy link
Collaborator

@danielinteractive danielinteractive left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @gowerc , looks good, see one suggestion below

R/Grid.R Outdated Show resolved Hide resolved
@gowerc gowerc merged commit 2c22b29 into main Apr 8, 2024
@gowerc gowerc deleted the feature/more-grids branch April 8, 2024 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a GridSpan()
2 participants