Skip to content

groupBy and merge#6

Merged
Kriyszig merged 10 commits into
masterfrom
group
Jul 17, 2019
Merged

groupBy and merge#6
Kriyszig merged 10 commits into
masterfrom
group

Conversation

@Kriyszig
Copy link
Copy Markdown
Owner

This PR consists of work on groupBy and merge.

cc/ @thewilsonator
Ready for review :octocat:
Some commits are smaller than others due to the ill health 😅. Let me know if you would like any changes. I'll make them ASAP 🏃‍♂️

Kriyszig added 8 commits July 10, 2019 22:49
* Replaced DataFrame array with TypeTuple
* Create Group from DataFrame
* Display a single or multiple groups using string group title and
integer position.
* Also added getGroups
* Added more unittest
* Implemented combine to combine Groups to give a DataFrame
* Index.extend now takes argument to insert index at a particular position
* Added test to check display function on DataFrame without indexing for row
* Added indexToData to convert a level of row index to data column
* Removed trailing wite spaces in display()
* Updated all display tests
* Index operation to get an element from integral and string index
* Index operation to retrieve an entire row/column as an Axis
structure.
* Group supports binary operations both row/column
* Added unittests to verify consistency
… DataFrame

* Reduced code repetition in group.d
* Added shorthand operations for DataFrame
* Merge two DataFrames to one based on row index
* Added unittests to verify correct behavior
@Kriyszig
Copy link
Copy Markdown
Owner Author

Squashed a couple of weird commits. Hope that helps 😅

Comment thread source/magpie/group.d
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d
Comment thread source/magpie/group.d
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d
Comment thread source/magpie/group.d
Comment thread source/magpie/group.d
Comment thread source/magpie/index.d Outdated
Comment thread source/magpie/index.d
Comment thread source/magpie/index.d
@thewilsonator
Copy link
Copy Markdown

thewilsonator commented Jul 11, 2019

Argh didn't mean to approve that.

Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/group.d Outdated
Comment thread source/magpie/dataframe.d Outdated
Comment thread source/magpie/helper.d Outdated
Comment thread source/magpie/helper.d Outdated
Comment thread source/magpie/index.d Outdated
Comment thread source/magpie/operation.d
Comment thread source/magpie/operation.d Outdated
Comment thread source/magpie/operation.d Outdated
@Kriyszig
Copy link
Copy Markdown
Owner Author

Kriyszig commented Jul 11, 2019

Thanks for the thorough review. I'll get on the optimization :octocat:

Kriyszig added 2 commits July 12, 2019 10:38
* Binary Operations will require an explicit conversion to assign floating point values to integer
* Used mixins for ops
* Redefined index operations to avoid collisions
* Used ref in loops
* Removed redundant code
* Refactored helpers
* Used ptrdiff_t for getPosition
* Updated tests to account for change
* Added a template to check for type DataFrame
* Used template to verify if the argument for merge is indeed a DataFrame
@Kriyszig Kriyszig merged commit 7eda8fd into master Jul 17, 2019
@Kriyszig Kriyszig deleted the group branch July 17, 2019 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants