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

Fix cpp pointer bug #435

Merged
merged 35 commits into from
Jan 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
536e7db
fix doi
martinju Dec 29, 2024
455f425
remove vignette figures from Rbuildignore
martinju Dec 29, 2024
17c4496
starting on cran-comments
martinju Dec 29, 2024
e9b30c0
spelling
martinju Dec 29, 2024
c626e8a
replace sciencedirect link (instead of going doi) with mj.com link
martinju Dec 29, 2024
eb902f4
cran comments
martinju Dec 29, 2024
de9b8c7
Final cran comments. Ready for submission upon merge to master
martinju Dec 29, 2024
54591d2
Merge remote-tracking branch 'origin/master' into CRANsubmission
martinju Jan 7, 2025
8c65bf8
submitted!
martinju Jan 7, 2025
4e8537a
Fix cran note regarding too long cpu time
martinju Jan 7, 2025
0f8b43d
another attempt
martinju Jan 7, 2025
d3bb187
furr to progressr link
martinju Jan 14, 2025
1ae012b
skip parallelization tests on cran
martinju Jan 14, 2025
d52df66
\dontrun on long running examples
martinju Jan 14, 2025
19e9054
.
martinju Jan 14, 2025
cc641d0
forcing single threading for test in testthat.R
martinju Jan 15, 2025
afdbbef
quote shaprpy + Python per CRAN request
martinju Jan 16, 2025
6e85db2
Reduce size by adding snaps and paper folds to rbuildignor
martinju Jan 16, 2025
a8f38fe
repo -> repository
martinju Jan 16, 2025
3c9958d
trying to remove the pointers in the main gaussian cpp function
martinju Jan 17, 2025
5054e82
testing
martinju Jan 17, 2025
2770b43
removing both asym caus tests goes through. now keeping only setup
martinju Jan 18, 2025
1c46922
single commented out test
martinju Jan 18, 2025
c5580af
reverse errorcandidates
martinju Jan 18, 2025
439ea6a
idientified the critical test
martinju Jan 18, 2025
c042aff
bugfix integer(0) -> NULL edge case
martinju Jan 20, 2025
a48f659
temporary global bugfix stuff
martinju Jan 20, 2025
18bd542
unstage tmp globals
martinju Jan 20, 2025
e638541
update test files after bugfix
martinju Jan 20, 2025
8e3e41f
additional equality test for regular condsym
martinju Jan 20, 2025
f5104e7
Merge branch 'master' into fix_cpp_pointer_bug
martinju Jan 20, 2025
91970ac
styler
martinju Jan 20, 2025
abcb25a
update news
martinju Jan 20, 2025
e11dca1
moving back to pointers in the gaussian cpp func
martinju Jan 20, 2025
c4a84c9
rerun vignettes
martinju Jan 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
repo -> repository
martinju committed Jan 16, 2025
commit a8f38fe71d947b0ab29376f03c3740fb716d2b02
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Description: Complex machine learning models are often hard to interpret. Howeve
with a solid theoretical foundation. Previously known methods for estimating the Shapley
values do, however, assume feature independence. This package implements methods which accounts for any feature
dependence, and thereby produces more accurate estimates of the true Shapley values.
An accompanying 'Python' wrapper ('shaprpy') is available through the GitHub repo.
An accompanying 'Python' wrapper ('shaprpy') is available through the GitHub repository.
Authors@R: c(
person("Martin", "Jullum", email = "[email protected]", role = c("cre", "aut"), comment = c(ORCID = "0000-0003-3908-5155")),
person("Lars Henry Berge", "Olsen", email = "[email protected]", role = "aut", comment = c(ORCID = "0009-0006-9360-6993")),
22 changes: 9 additions & 13 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# shapr 1.0.1 (Major release)

* **By CRAN request** after initial submission:
* Fixed spelling in DESCRIPTION
* Reduced tarball size mainly by (temporary) removing snapshot files from the build as they are not run on CRAN.

* Complete rewrite of the package compared to the previous CRAN release. We moved from two main user functions
`shapr()` and `explain()` to a single function `explain()` that includes both.
Thus, this change breaks essentially all existing code that uses the previous version of the package.
@@ -23,24 +27,16 @@ The win-builder and R-hub tests are run without snapshots tests (to replicate CR

## R CMD check results

There were no ERRORs or WARNINGs

There were 2 NOTES

### NOTE 1 (on win-builder (oldrelease)):

Possibly misspelled words in DESCRIPTION:
shaprpy (10:35)

> This refers to the Python wrapper of the package and is not misspelled.
There were no ERRORs, WARNINGs

There were 1 NOTE

### NOTE 2 (multiple platforms):
### NOTE (multiple platforms):

* checking installed package size ... NOTE
installed size is 8.0Mb
installed size is 7.1Mb
sub-directories of 1Mb or more:
doc 4.4Mb
doc 4.2Mb
libs 1.3Mb

> The package is growing in size, uses more complied code, and the documentation is comprehensive.
2 changes: 1 addition & 1 deletion man/shapr-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.