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 #25 #27

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix #25 #27

wants to merge 4 commits into from

Conversation

bitbacchus
Copy link

Please review.

I finally decided against exporting the functions as they would require documentation then and as the functions are part of the doc themselves, this would make no sense, imho... Hence there is no Roxygen needed.

TODO:

  • bump version / update NEWS.md
  • update RcppProgress-package.Rd Using RcppProgress in your package
    • RcppProgress (>= new version)
    • MakeVars is not needed anymore when you use // [[Rcpp::depends(RcppProgress)]] (AFAIK)

This gives a warning, It makes no sense to me and the tests are still passing.
@kforner
Copy link
Owner

kforner commented Sep 3, 2020

where is CxxFlags() used ?

@bitbacchus
Copy link
Author

where is CxxFlags() used ?

In de doc:

MakeVars
edit src/MakeVars and replace its content by

PKG_LIBS = '$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"' $(SHLIB_OPENMP_CXXFLAGS) '$(R_HOME)/bin/Rscript -e "RcppProgress:::CxxFlags()"' and

PKG_CXXFLAGS +=-Ilibsrc $(SHLIB_OPENMP_CXXFLAGS) '$(R_HOME)/bin/Rscript -e "RcppProgress:::CxxFlags()"'

(and I use it to set up my build environment with qmake)

@codecov
Copy link

codecov bot commented Sep 3, 2020

Codecov Report

Merging #27 into master will decrease coverage by 30.00%.
The diff coverage is 25.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##            master      #27       +/-   ##
============================================
- Coverage   100.00%   70.00%   -30.00%     
============================================
  Files            1        2        +1     
  Lines           24       30        +6     
============================================
- Hits            24       21        -3     
- Misses           0        9        +9     
Impacted Files Coverage Δ
R/CxxFlags.R 0.00% <0.00%> (ø)
R/wrap_examples.R 91.30% <60.00%> (-8.70%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b706e3b...836a849. Read the comment docs.

@kforner
Copy link
Owner

kforner commented Sep 3, 2020

  • wrap_examples should be removed
  • tests should use the R code from the package
  • CxxFlags() should be tested

@bitbacchus
Copy link
Author

Can you elaborate a bit?

  • wrap_examples should be removed

you mean the one in the tests? I have no clue why it is there. Did you write it?
Or should each fun go to a separate file?

  • tests should use the R code from the package

I have not touched the tests, except the removal of the source(...).

  • CxxFlags() should be tested

Do you have a suggestion against what should be tested? I mean the function returns different strings, depending on your installation...

@kforner
Copy link
Owner

kforner commented Sep 10, 2020

you mean the one in the tests? I have no clue why it is there. Did you write it?
Or should each fun go to a separate file?

I probably moved it from R/ when I wrote the tests, forgetting that it was referenced in the docs.
Should be removed from tests/

  • tests should use the R code from the package

I have not touched the tests, except the removal of the source(...).

I don't think they work, e.g. test_sequential(nb = 500) should be replaced by RcppProgress:::test_sequential(nb = 500) since the functions are not exported. Or maybe we should export them..., especiall cxxflags.

Do you have a suggestion against what should be tested? I mean the function returns different strings, depending on your installation...

just checking that it's callable is a start. You could try to mess up with .Platform (and restoring it) to test the two cases if you are motivated.

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.

2 participants