handle A ~ B - 1 and add tests
#1086
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nalimilan
reviewed
Oct 1, 2016
| @@ -40,6 +40,9 @@ type Terms | |||
| intercept::Bool # is there an intercept column in the model matrix? | |||
| end | |||
|
|
|||
| import Base.== | |||
| ==(t1::Terms, t2::Terms) = all( getfield(t1, f)==getfield(t2, ) for f in fieldnames(t1)) | |||
There was a problem hiding this comment.
We don't seem to import functions in this file.
There was a problem hiding this comment.
It's not strictly necessary, just a convenience for testing Terms. I could move it to the test file?
There was a problem hiding this comment.
I just meant that you should write Base.:(==)(...) = .... Though I just noticed f seems to be missing in getfield(t2, )?
There was a problem hiding this comment.
That would explain the test failures :) I tried it without the import first but didn't realize that Base.:(==) was the right way to refer to == in that context, thanks.
nalimilan
reviewed
Oct 3, 2016
| a3 = dospecials(excp) | ||
| if a1 == :- | ||
| a2, a3 = excp.args[2:3] | ||
| a3 == 1 || error("invalid expression $ex; subtraction only supported or -1") |
nalimilan
reviewed
Oct 3, 2016
| t = Terms(y ~ -1 + x1 + x2) | ||
| @test t.intercept == false | ||
| @test t.terms == [:x1, :x2] | ||
| @test t == Terms(y ~ -1 + x1 + x2) == Terms(y ~ x1 - 1 + x2) == Terms(y ~ x1 + x2 -1) |
There was a problem hiding this comment.
Maybe also test for the error case?
nalimilan
approved these changes
Oct 3, 2016
ararslan
approved these changes
Oct 3, 2016
nalimilan
pushed a commit
that referenced
this pull request
Jul 8, 2017
nalimilan
pushed a commit
that referenced
this pull request
Jul 8, 2017
rofinn
pushed a commit
that referenced
this pull request
Aug 17, 2017
nalimilan
pushed a commit
that referenced
this pull request
Aug 25, 2017
quinnj
pushed a commit
that referenced
this pull request
Sep 2, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #574.