-
Notifications
You must be signed in to change notification settings - Fork 108
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
Solved #174 and #214 #216
Solved #174 and #214 #216
Conversation
Renamed params from 'vector' to 'that' for Vector methods, fixes #182.
* | ||
* @return equals of this matrix to that | ||
*/ | ||
public boolean equals(Object object, double precision); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make this method take matrix object instead? So, we have to move class casting to equals(object)
method.
Added vector class documentation.
Maxim @SamoylovMD, this is huge! I appreciate your hard work on a project. Let me carefully review it this evening (in 8-10 hours). |
Conflicts: src/main/java/org/la4j/vector/AbstractVector.java
(cherry picked from commit b429b5b)
Finally, I won those troubles with version conflict. |
43 commits? Omg! |
Oh did I make this have merge conflicts :P I only changed fields to final. It might be easier to merge this first then I'll redo what I did. Or we can manually merge this in (that's probably a better idea). I can help out with that. |
I would prefer somehow to clear this PR. I mean, it should not be 43 duplicated commits. |
The best solution there would be to squash all these commits. I'm guessing @SamoylovMD can do it, but I can help if necessary. Otherwise I can check this out, merge it with master, then @SamoylovMD can checkout my merged branch and update this PR. (I actually really want to merge this. Call me crazy but I like merging/rebasing big things) |
Yeah. It's big. I'm not against its size: it's totally fine. I'm agains running the git log history. |
Here's a nice blog post on how to update your fork with the changes that have been merged into the main repo's master - http://joshbranchaud.com/blog/2014/01/17/Updating-Forked-Git-Repository-With-Latest-Upstream-Changes.html |
@SamoylovMD, you better have some sleep btw :) // looking at your commit log timestamps. The only way I see is to create a separate branch, which is equal to current master and cherry-pick there all the needed commits from this PR. |
I can try to merge it using command line to avoid duplicates. @SamoylovMD you can live it as is for now. |
Ok, I'll just wait. |
I'll squash then manually merge it, then you can grab my copy. I'll get it done tonight. |
@anubiann00b, then you can just make a PR with @SamoylovMD' commits. This should work. |
Ok. I'll get on it tonight. This will be fun! |
Wait this will be a mess to squash... There are commits before and after the PR's I made. I'll just squash the contiguous blocks and the manually fix things in between. |
@DWiechert thx for the link! |
This is merged (thanks @anubiann00b!), so we can close this one. |
Now we can write tests according to junit 4 annotations syntax. Another feature is new
equals(object, precision)
method inVector
andMatrix
which allows us to replaceMockMatrix
andMockVector
classes safely.