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 issue #2624 #322

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Fix issue #2624 #322

merged 2 commits into from
Jul 5, 2024

Conversation

JTPetter
Copy link
Contributor

@JTPetter JTPetter commented Jul 3, 2024

@JTPetter JTPetter requested a review from maltelueken July 3, 2024 15:33
Copy link

@maltelueken maltelueken left a comment

Choose a reason for hiding this comment

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

Looks good!

Three tests are failing on Mac, is that expected?

@JTPetter
Copy link
Contributor Author

JTPetter commented Jul 5, 2024

Yes, it seems that on Mac it is producing NaN now somewhere instead of NA, but the test is only for some edge case anyway, and I suppose NaN works too. Unfortunately I cannot fix it on Mac.

@JTPetter
Copy link
Contributor Author

JTPetter commented Jul 5, 2024

But looks like I need another review to merge...

@JTPetter JTPetter requested a review from koenderks July 5, 2024 12:01
@koenderks
Copy link
Contributor

koenderks commented Jul 5, 2024

It is probably best to add testthat::skip_on_os("mac") to the failing test and then make another test specifically for mac with the NaN while adding testthat::skip_on_os(c("windows", "linux")). Preferably we have all successful tests even if there is a NaN. So then you have one test for windows and linux and one for mac. I'll leave that decision up to you.

See jasp-stats/jaspMachineLearning@0ee2d6f for a similar fix.

@@ -337,7 +337,7 @@ doeFactorial <- function(jaspResults, dataset, options, ...) {
df <- .doeRsmCategorical2df(options[["categoricalVariables"]])
designSpec <- .doeFactorialGetSelectedDesign(jaspResults, options)
if (length(designSpec) == 0) {
return()
stop("No generator provided.")
Copy link
Contributor

Choose a reason for hiding this comment

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

jaspBase:::.quitAnalysis()?

@JTPetter
Copy link
Contributor Author

JTPetter commented Jul 5, 2024

I did not know about he skipping. Thank you! I added it.

@JTPetter JTPetter merged commit 737d553 into jasp-stats:master Jul 5, 2024
5 checks passed
@JTPetter JTPetter deleted the fix2624 branch July 19, 2024 13:22
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.

3 participants