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

Make JoinKeys related changes due to refactor #486

Merged
merged 9 commits into from
Nov 20, 2023
Merged

Conversation

vedhav
Copy link
Contributor

@vedhav vedhav commented Nov 3, 2023

Related to teal.data PR #184
Make changes to teal.slice because of the refactor to the JoinKeys class from R6 to S3.

This diagram shows the R6 methods along with the replacement S3 methods/functions.

Screenshot 2023-11-15 at 3 56 36 PM

@m7pr
Copy link
Contributor

m7pr commented Nov 3, 2023

Wow, great diagram, very heplful!

@vedhav vedhav marked this pull request as ready for review November 8, 2023 06:48
Copy link
Contributor

github-actions bot commented Nov 8, 2023

badge

Code Coverage Summary

Filename                      Stmts    Miss  Cover    Missing
--------------------------  -------  ------  -------  --------------------------------------------------------------------------------------------------------------------------------------------------------------------------
R/calls_combine_by.R              8       0  100.00%
R/choices_labeled.R              49      14  71.43%   22, 33, 38, 48-53, 65, 69-73
R/count_labels.R                 98       0  100.00%
R/filter_panel_api.R             37       2  94.59%   92, 104
R/FilteredData-utils.R          123      21  82.93%   109-114, 207, 229-238, 298-301
R/FilteredData.R                591     227  61.59%   98-101, 166, 349, 525-533, 602-611, 633, 654-695, 713-716, 732, 773-806, 821-823, 827-833, 859-887, 909-911, 915-917, 920-931, 935-944, 946-972, 990-1060, 1102, 1125-1147
R/FilteredDataset-utils.R        20       1  95.00%   133
R/FilteredDataset.R             179      67  62.57%   50, 149, 198-204, 232-289, 329-331
R/FilteredDatasetDefault.R      121       9  92.56%   69, 131, 141, 145, 228-232
R/FilteredDatasetMAE.R          134      37  72.39%   27, 113-118, 157-162, 166-167, 187-209
R/FilterPanelAPI.R               10       0  100.00%
R/FilterState-utils.R           101       2  98.02%   262, 290
R/FilterState.R                 361      61  83.10%   88, 212, 230-234, 241-242, 256-257, 263-264, 312, 314, 316, 368, 412, 644, 687-712, 723-742, 777-783, 792-798
R/FilterStateChoices.R          338     106  68.64%   302-305, 317, 360, 384-391, 395-412, 441, 456-467, 479-487, 491-520, 541-544, 547-550, 561-582, 595-596, 606
R/FilterStateDate.R             212     129  39.15%   219, 272-430
R/FilterStateDatettime.R        307     199  35.18%   256, 309-541
R/FilterStateEmpty.R             53      31  41.51%   82, 92-97, 111, 125-166
R/FilterStateExpr.R              75      62  17.33%   138-262
R/FilterStateLogical.R          196     144  26.53%   127, 150, 210, 213-399
R/FilterStateRange.R            410     105  74.39%   254, 378, 506-510, 513-523, 526, 538-544, 555-567, 571-581, 585-587, 601-628, 643, 646, 661-678, 713-718, 728-730
R/FilterStates-utils.R           70       9  87.14%   102, 121, 179-185, 207, 234
R/FilterStates.R                364      30  91.76%   76-80, 189, 320-329, 417-420, 463, 548-552, 597, 718-721
R/FilterStatesDF.R                5       0  100.00%
R/FilterStatesMAE.R              10       1  90.00%   39
R/FilterStatesMatrix.R            3       0  100.00%
R/FilterStatesSE.R              211     157  25.59%   34, 69-71, 81-83, 107-114, 122-129, 152-300
R/include_css_js.R                5       5  0.00%    12-16
R/teal_slice.R                  107       2  98.13%   135, 201
R/teal_slices.R                 139       6  95.68%   144-149, 334
R/test_utils.R                   21       0  100.00%
R/utils.R                        49       2  95.92%   101-102
R/variable_types.R               48      33  31.25%   41-46, 56, 69-104
R/zzz.R                          15      15  0.00%    3-46
TOTAL                          4470    1477  66.96%

Diff against main

Filename                  Stmts    Miss  Cover
----------------------  -------  ------  -------
R/FilteredData-utils.R        0      +4  -3.25%
R/FilteredData.R             +3      +1  +0.03%
TOTAL                        +3      +5  -0.09%

Results for commit: fcec5e8

Minimum allowed coverage is 80%

♻️ This comment has been updated with latest results

Copy link
Contributor

github-actions bot commented Nov 8, 2023

Unit Tests Summary

    1 files    28 suites   22s ⏱️
371 tests 371 ✔️ 0 💤 0
846 runs  846 ✔️ 0 💤 0

Results for commit fcec5e8.

♻️ This comment has been updated with latest results.

Merges to #486 

Updates `teal.slice` with latest change from `teal.data` class names
@pawelru
Copy link
Contributor

pawelru commented Nov 13, 2023

Please vbump teal.data deps once you got it merged and new version number available

Copy link
Contributor

github-actions bot commented Nov 15, 2023

Unit Test Performance Difference

Test Suite $Status$ Time on main $±Time$ $±Tests$ $±Skipped$ $±Failures$ $±Errors$
FilteredData 💚 $14.40$ $-3.89$ $-1$ $0$ $0$ $0$
MAEFilteredDataset 💚 $3.95$ $-1.64$ $0$ $0$ $0$ $0$
Additional test case details
Test Suite $Status$ Time on main $±Time$ Test Case
FilteredData 💀 $0.05$ $-0.05$ FilteredData_forbids_cyclic_graphs_of_datasets_relationship
FilteredData 💚 $6.79$ $-1.48$ constructor_accepts_call_with_only_dataset_specified
FilteredData 💀 $0.03$ $-0.03$ constructor_accepts_join_keys_to_be_JoinKeys_or_NULL
FilteredData 👶 $+0.02$ constructor_accepts_join_keys_to_be_join_keys_or_NULL
FilteredData 💀 $0.01$ $-0.01$ get_join_keys_returns_empty_JoinKeys_object
FilteredData 👶 $+0.01$ get_join_keys_returns_empty_join_keys_object
init_filtered_data 💀 $0.01$ $-0.01$ init_filtered_data.default_asserts_join_keys_is_JoinKeys_
init_filtered_data 👶 $+0.01$ init_filtered_data.default_asserts_join_keys_is_join_keys_

Results for commit 9da9c1f

♻️ This comment has been updated with latest results.

@m7pr
Copy link
Contributor

m7pr commented Nov 15, 2023

@vedhav is the diagram still up to date? I think at least we changed JoinKeys name to join_keys : ) This was great help and I reckon we could keep it updated

@vedhav
Copy link
Contributor Author

vedhav commented Nov 15, 2023

@m7pr updated the diagram

@m7pr
Copy link
Contributor

m7pr commented Nov 15, 2023

thanks, you da man

NEWS.md Outdated Show resolved Hide resolved
R/FilteredData.R Outdated Show resolved Hide resolved
R/FilteredData.R Outdated Show resolved Hide resolved
vedhav and others added 4 commits November 17, 2023 15:32
Signed-off-by: Vedha Viyash <[email protected]>
Co-authored-by: kartikeya kirar <[email protected]>
Signed-off-by: Vedha Viyash <[email protected]>
Co-authored-by: kartikeya kirar <[email protected]>
Signed-off-by: Vedha Viyash <[email protected]>
Copy link
Contributor

@kartikeyakirar kartikeyakirar left a comment

Choose a reason for hiding this comment

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

changes looks good!

@vedhav vedhav enabled auto-merge (squash) November 20, 2023 08:57
@vedhav vedhav merged commit 60d9847 into main Nov 20, 2023
23 checks passed
@vedhav vedhav deleted the 78_simplify_joinkeys@main branch November 20, 2023 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request]: Change JoinKeys to something simpler
5 participants