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.

Sign up for GitHub

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

Jump to bottom

Check and update data before explanation #245

Merged
merged 80 commits into from
Jan 26, 2021
Merged

Check and update data before explanation #245

merged 80 commits into from
Jan 26, 2021

Commits on Nov 20, 2020

  1. NOTE ON TODO

    @martinju
    martinju committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    b7cda2a View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2020

  1. edit stop message

    @martinju
    martinju committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    d0b33f6 View commit details
    Browse the repository at this point in the history

  2. create custom model checking function

    @martinju
    martinju committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    bd53c55 View commit details
    Browse the repository at this point in the history

  3. save current WIP state

    @martinju
    martinju committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    486e3e7 View commit details
    Browse the repository at this point in the history

  4. start of new get_model_features structure

    @martinju
    martinju committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    0cbc73a View commit details
    Browse the repository at this point in the history

  5. done with get_model_features -- continue with get_data_features!

    @martinju
    martinju committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    a7064f0 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. added get_data_features

    @martinju
    martinju committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    29b671d View commit details
    Browse the repository at this point in the history

  2. done with shapr functions. Do the same with explain

    @martinju
    martinju committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    349b4d3 View commit details
    Browse the repository at this point in the history

  3. cleanup old functions

    @martinju
    martinju committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    476a703 View commit details
    Browse the repository at this point in the history

  4. explanation-func

    @martinju
    martinju committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    37ee3bc View commit details
    Browse the repository at this point in the history

  5. started tests + adding factor level reordering

    @martinju
    martinju committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    35ed600 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2020

  1. work on updater

    @martinju
    martinju committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    8e5a7d2 View commit details
    Browse the repository at this point in the history

  2. finished update data

    @martinju
    martinju committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    0b0112d View commit details
    Browse the repository at this point in the history

  3. started fixing update_data

    @martinju
    martinju committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    c5b6145 View commit details
    Browse the repository at this point in the history

  4. Finished tests for check_features ++

    @martinju
    martinju committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    7214b53 View commit details
    Browse the repository at this point in the history

  5. edits + docu

    @martinju
    martinju committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    d98f5d2 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. Some documentation + tests for update_data

    @martinju
    martinju committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    037d4a1 View commit details
    Browse the repository at this point in the history

  2. Update FULLY checked explainer object for tests

    @martinju
    martinju committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    debea32 View commit details
    Browse the repository at this point in the history

  3. bugfix for how dummylist was used + started to improve tests for shapr

    @martinju
    martinju committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    ca02ebf View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. bugfix + more tests

    @martinju
    martinju committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    3377083 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. Various testing updates 

    Currently not possible to test the custom model as get_supported_models searches globalenv, but apparently not the testing environment
    @martinju
    martinju committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    1c3704f View commit details
    Browse the repository at this point in the history

  2. hack to simplify bugfix with testthat/methods

    @martinju
    martinju committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    8448d49 View commit details
    Browse the repository at this point in the history

  3. .

    @martinju
    martinju committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    e0cec62 View commit details
    Browse the repository at this point in the history

  4. bugfix

    @martinju
    martinju committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    4194177 View commit details
    Browse the repository at this point in the history

  5. fixed methods-stuff in tests by attach/detach inside the test

    @martinju
    martinju committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    8dc927d View commit details
    Browse the repository at this point in the history

  6. updating todo

    @martinju
    martinju committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    cbbc182 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. updating examples + todo

    @martinju
    martinju committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    61ef798 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2021

  1. adding function fix_data ++

    @martinju
    martinju committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    5b8547d View commit details
    Browse the repository at this point in the history

  2. fix feature_labels issue

    @martinju
    martinju committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    e2201d1 View commit details
    Browse the repository at this point in the history

  3. fix all tests (for now)

    @martinju
    martinju committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    3aba239 View commit details
    Browse the repository at this point in the history

  4. remove model_type from core of explainer

    @martinju
    martinju committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    0400d5a View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2021

  1. wrapping up

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    c9a14f7 View commit details
    Browse the repository at this point in the history

  2. check passed

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    ef1c718 View commit details
    Browse the repository at this point in the history

  3. style explanation.R

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    b0c57b2 View commit details
    Browse the repository at this point in the history

  4. update todo

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    9af5227 View commit details
    Browse the repository at this point in the history

  5. .

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    bf80e55 View commit details
    Browse the repository at this point in the history

  6. renormalize line endings on windows

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    ed3f540 View commit details
    Browse the repository at this point in the history

  7. naming and simplification

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    e762cfc View commit details
    Browse the repository at this point in the history

  8. docs

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    90ffdc4 View commit details
    Browse the repository at this point in the history

  9. update preprocess_data

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    1a57ae6 View commit details
    Browse the repository at this point in the history

  10. pass data feature description if no check for model

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    4ae6428 View commit details
    Browse the repository at this point in the history

  11. add specs type instead of names to check_features

    @martinju
    martinju committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    ceacfae View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. idea update

    @martinju
    martinju committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    8f03bb3 View commit details
    Browse the repository at this point in the history

  2. git add --renormalize

    @martinju
    martinju committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    375a5eb View commit details
    Browse the repository at this point in the history

  3. Started to update make and apply dummies

    @martinju
    martinju committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    ab8a750 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2021

  1. .

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    9acbd5c View commit details
    Browse the repository at this point in the history

  2. make dummies and apply_dummies updated

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    62c47a5 View commit details
    Browse the repository at this point in the history

  3. make tests pass

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    9d4ee53 View commit details
    Browse the repository at this point in the history

  4. dummylist -> feature_list within package

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    12b295c View commit details
    Browse the repository at this point in the history

  5. x -> model in get_model_specs

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    3826222 View commit details
    Browse the repository at this point in the history

  6. move processing to new file

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    0fc8a40 View commit details
    Browse the repository at this point in the history

  7. .

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    e5d5ecc View commit details
    Browse the repository at this point in the history

  8. f_list_2 edits

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    ca544cf View commit details
    Browse the repository at this point in the history

  9. some doc updates

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    87aeabe View commit details
    Browse the repository at this point in the history

  10. Removed feature_labels from shapr to always require get_model_specs

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    b318e45 View commit details
    Browse the repository at this point in the history

  11. .

    @martinju
    martinju committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    5c3974b View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2021

  1. modified example

    @martinju
    martinju committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    bdfa9b9 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. fixing check_features + passing tests

    @martinju
    martinju committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    f0806e1 View commit details
    Browse the repository at this point in the history

  2. make cusotm model example

    @martinju
    martinju committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    f2ebb9e View commit details
    Browse the repository at this point in the history

  3. move from model_type to model_checker 

    and doing this checking within get_model_specs, but I don't require this function at all for custom models to simplify
    @martinju
    martinju committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    fd9f432 View commit details
    Browse the repository at this point in the history

  4. .

    @martinju
    martinju committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    7912b68 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2021

  1. update vignette with new style

    @martinju
    martinju committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    acd81a8 View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @martinju
    martinju committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    56a8486 View commit details
    Browse the repository at this point in the history

  3. remove native column

    @martinju
    martinju committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    4b907e7 View commit details
    Browse the repository at this point in the history

  4. ensure naming of f_lists are being used

    @martinju
    martinju committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    b0623c0 View commit details
    Browse the repository at this point in the history

  5. .

    @martinju
    martinju committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    4375439 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2021

  1. docs and examples done

    @martinju
    martinju committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    80901b3 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2021

  1. make actions run also on cranversion repo

    @martinju
    martinju committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    29bfa76 View commit details
    Browse the repository at this point in the history

  2. Use suggested packages conditionally -- Get back on CRAN (#246)

    @martinju
    martinju authored Jan 21, 2021
    Configuration menu
    Copy the full SHA
    8bad733 View commit details
    Browse the repository at this point in the history

  3. remove $p in shapr

    @martinju
    martinju committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    e2c4e10 View commit details
    Browse the repository at this point in the history

  4. cran submission

    @martinju
    martinju committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    74e3117 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. Merge remote-tracking branch 'origin/cranversion' into martin/check_f… 

    …actors
    @martinju
    martinju committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    b61c58b View commit details
    Browse the repository at this point in the history

  2. Update examples and tests according to CRAN policy

    @martinju
    martinju committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    332b966 View commit details
    Browse the repository at this point in the history

  3. Add manual test ++

    @martinju
    martinju committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    4cee96a View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Apply suggestions from code review 

    95% Annabelles comments. Some minor modifications

Co-authored-by: Annabelle Redelmeier <[email protected]>
    @martinju @aredelmeier
    martinju and aredelmeier authored Jan 25, 2021
    Configuration menu
    Copy the full SHA
    13e92c9 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    forgotten suggestion

Co-authored-by: Annabelle Redelmeier <[email protected]>
    @martinju @aredelmeier
    martinju and aredelmeier authored Jan 25, 2021
    Configuration menu
    Copy the full SHA
    09407d5 View commit details
    Browse the repository at this point in the history

  3. Auto stash before merge of "martin/check_factors" and "origin/martin/… 

    …check_factors"
    @martinju
    martinju committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    6d8cf0f View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. Review updates

    @martinju
    martinju committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    2761d59 View commit details
    Browse the repository at this point in the history

  2. Allow NULL feature labels in model for checking

    @martinju
    martinju committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    320a20e View commit details
    Browse the repository at this point in the history

  3. do factor level checking only for factors 

    and do not accept NULL either
    @martinju
    martinju committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    596c2da View commit details
    Browse the repository at this point in the history