Rebasing with gota dev branch #2
Closed
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
Co-authored-by: Carl Kingsford <carlk@cs.cmu.edu>
Concat concatenates rows of two dataframes like RBind, but also includes the unmatched columns.
* added missing closing brace in series/series.go (function Map) * removed empty line at beginning of function series/series.go/Map * implemented user-defined comparator for series' * added and semantics for row filtering with multiple filters * refined README for filtering with OR, AND, and user-defined filters (CompFunc)
…st) (#0) * Set up TravisCI * Make fixColnames faster (go-gota#112) Co-authored-by: Carl Kingsford <carlk@cs.cmu.edu> * Add dataframe.Concat (go-gota#104) Concat concatenates rows of two dataframes like RBind, but also includes the unmatched columns. * Combining filters with AND and user-defined filters (go-gota#99) * added missing closing brace in series/series.go (function Map) * removed empty line at beginning of function series/series.go/Map * implemented user-defined comparator for series' * added and semantics for row filtering with multiple filters * refined README for filtering with OR, AND, and user-defined filters (CompFunc) * Run go mod tidy * Add extra checks for TravisCI * Use UseNumber() when parsing JSON to interface{} (go-gota#116) * Add ReadHTML to support loading HTML tables (go-gota#107) * Allow numeric column-index for filters (go-gota#106) Co-authored-by: Alex Sanchez <kniren@gmail.com> Co-authored-by: gmarcais <gus@marcais.net> Co-authored-by: Carl Kingsford <carlk@cs.cmu.edu> Co-authored-by: Mura Li <typeless@users.noreply.github.com> Co-authored-by: Christoph Laaber <christoph.laaber@gmail.com> Co-authored-by: gautamoncloud9 <gautamoncloud9@gmail.com>
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.
I think I have made a mistake with #1, I forgot to rebase dev which still leave the conflics on gota:dev upstream.
Should now be fine