Skip to content

Conversation

@gogonzo
Copy link
Contributor

@gogonzo gogonzo commented Jan 25, 2024

closes #531
We used to distinguish sub-items of the MAE object by term datalabel. We don't do this anymore, this is artifact after the refactor.

@gogonzo gogonzo changed the base branch from main to pre-release-cleanup@main January 25, 2024 13:19
@gogonzo gogonzo added the core label Jan 25, 2024
@github-actions
Copy link
Contributor

badge

Code Coverage Summary

Filename                        Stmts    Miss  Cover    Missing
----------------------------  -------  ------  -------  -------------------------------------------------------------------------------------------------------------------------------------------------
R/calls_combine_by.R                7       0  100.00%
R/choices_labeled.R                49      14  71.43%   25, 36, 41, 51-56, 68, 72-76
R/count_labels.R                   97       0  100.00%
R/filter_panel_api.R               29       1  96.55%   134
R/FilteredData-utils.R             68      25  63.24%   17-20, 23-26, 48-53, 146, 168-177
R/FilteredData.R                  554     218  60.65%   181, 323, 395, 502-511, 535, 556-597, 615-618, 634, 676-709, 725-727, 731-737, 764-792, 816-818, 822-824, 827-838, 842-851, 853-891, 932, 955-977
R/FilteredDataset-utils.R          23       1  95.65%   112
R/FilteredDataset.R               176      67  61.93%   49, 149, 192-198, 226-283, 322-324
R/FilteredDatasetDataframe.R      121       8  93.39%   82, 144, 154, 230-234
R/FilteredDatasetDefault.R         18       4  77.78%   94-107
R/FilteredDatasetMAE.R            134      37  72.39%   49, 110-115, 154-159, 163-164, 182-204
R/FilterPanelAPI.R                 10       0  100.00%
R/FilterState-utils.R             101       2  98.02%   256, 286
R/FilterState.R                   361      61  83.10%   86, 210, 228-232, 239-240, 254-255, 261-262, 310, 312, 314, 366, 410, 642, 685-710, 721-740, 775-781, 790-796
R/FilterStateChoices.R            338     106  68.64%   309-312, 324, 367, 391-398, 402-419, 448, 463-474, 486-494, 498-527, 548-551, 554-557, 568-589, 602-603, 613
R/FilterStateDate.R               212     129  39.15%   226, 279-437
R/FilterStateDatettime.R          309     199  35.60%   266, 319-551
R/FilterStateEmpty.R               53      31  41.51%   89, 99-104, 118, 132-173
R/FilterStateExpr.R                75      62  17.33%   143-267
R/FilterStateLogical.R            196     144  26.53%   135, 158, 218, 222-409
R/FilterStateRange.R              410     105  74.39%   260, 384, 512-516, 519-529, 532, 544-550, 561-573, 577-587, 591-593, 607-634, 649, 652, 667-684, 719-724, 734-736
R/FilterStates-utils.R             70       9  87.14%   106, 125, 185-191, 213, 242
R/FilterStates.R                  364      30  91.76%   78-82, 191, 317-326, 414-417, 460, 545-549, 594, 715-718
R/FilterStatesDF.R                  5       0  100.00%
R/FilterStatesMAE.R                10       1  90.00%   40
R/FilterStatesMatrix.R              3       0  100.00%
R/FilterStatesSE.R                211     157  25.59%   36, 71-73, 83-85, 109-116, 124-131, 154-302
R/include_css_js.R                  5       5  0.00%    12-16
R/teal_slice.R                    107       4  96.26%   134, 188-189, 200
R/teal_slices.R                    84       5  94.05%   146-151
R/test_utils.R                     21       0  100.00%
R/utils.R                          18       0  100.00%
R/variable_types.R                 48      33  31.25%   45-50, 60, 73-108
R/zzz.R                            16      16  0.00%    3-46
TOTAL                            4303    1474  65.74%

Diff against main

Filename                    Stmts    Miss  Cover
------------------------  -------  ------  --------
R/calls_combine_by.R           -1       0  +100.00%
R/count_labels.R               -1       0  +100.00%
R/filter_panel_api.R           -6       0  -0.59%
R/FilteredData-utils.R        -30      -4  -7.17%
R/FilterStateDatettime.R       +2       0  +0.42%
R/utils.R                      -7      -2  +8.00%
TOTAL                         -43      -6  -0.20%

Results for commit: 04fff5f

Minimum allowed coverage is 80%

♻️ This comment has been updated with latest results

@github-actions
Copy link
Contributor

Unit Tests Summary

  1 files   29 suites   23s ⏱️
359 tests 359 ✅ 0 💤 0 ❌
822 runs  822 ✅ 0 💤 0 ❌

Results for commit 04fff5f.

@github-actions
Copy link
Contributor

Unit Test Performance Difference

Additional test case details
Test Suite $Status$ Time on main $±Time$ Test Case
utils 💀 $0.03$ $-0.03$ get_teal_bs_theme

Results for commit eb247b2

♻️ This comment has been updated with latest results.

@chlebowa
Copy link
Contributor

I still get the warning

utils::data(miniACC, package = "MultiAssayExperiment")
datasets <- FilteredData$new(list(iris = iris, mae = miniACC))
fs <-
  teal_slices(
    teal_slice(
      dataname = "iris", varname = "Sepal.Length", selected = c(5.1, 6.4),
      keep_na = TRUE, keep_inf = FALSE
    ),
    teal_slice(
      dataname = "iris", varname = "Species", selected = c("setosa", "versicolor"),
      keep_na = FALSE
    ),
    teal_slice(
      dataname = "mae", varname = "years_to_birth", selected = c(30, 50),
      keep_na = TRUE, keep_inf = FALSE
    ),
    teal_slice(dataname = "mae", varname = "vital_status", selected = "1", keep_na = FALSE),
    teal_slice(dataname = "mae", varname = "gender", selected = "female", keep_na = TRUE),
    teal_slice(
      dataname = "mae", varname = "ARRAY_TYPE",
      selected = "", keep_na = TRUE, datalabel = "RPPAArray", arg = "subset"
    )
  )

datasets$set_filter_state(state = fs)
[WARN] 2024-01-25 14:52:19.0469 pid:79753 token:[] teal.slice filters for columns: ARRAY_TYPE excluded from mae

@gogonzo
Copy link
Contributor Author

gogonzo commented Jan 25, 2024

I still get the warning
teal_slice(
dataname = "mae", varname = "ARRAY_TYPE",
selected = "", keep_na = TRUE, datalabel = "RPPAArray", arg = "subset"
)
)

Of course you have since you provide a wrong teal_slice. This is the change I've made in this PR - I replaced datalabel = in the example with experiment =. If you want to add filter for given experiment, please specify experiment = (instead of datalabel = )

@chlebowa
Copy link
Contributor

Of course. Sorry, I took the example from the old branch.

Copy link
Contributor

@chlebowa chlebowa left a comment

Choose a reason for hiding this comment

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

👌

@gogonzo gogonzo merged commit 5ecbaa9 into pre-release-cleanup@main Jan 25, 2024
@gogonzo gogonzo deleted the 531_warning_in_example@pre-release-cleanup@main branch January 25, 2024 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants