Skip to content
This repository has been archived by the owner on May 5, 2019. It is now read-only.

Enhance joining and grouping #17

Merged
merged 33 commits into from
Mar 6, 2017
Merged

Enhance joining and grouping #17

merged 33 commits into from
Mar 6, 2017

Commits on Feb 20, 2017

  1. merge alyst groupby to DataTables

    @cjprybol
    cjprybol committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    dd68a65 View commit details
    Browse the repository at this point in the history

  2. passing tests

    @cjprybol
    cjprybol committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    a5fd472 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into cjp/alyst-groupby

    @cjprybol
    cjprybol committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    9424201 View commit details
    Browse the repository at this point in the history

  4. revert seemingly unrelated changes

    @cjprybol
    cjprybol committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    a652768 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. revert unnecessary changes for variable name and spacing

    @cjprybol
    cjprybol committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    0cdf755 View commit details
    Browse the repository at this point in the history

  2. fix indentation issue

    @cjprybol
    cjprybol committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    d292dd3 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2017

  1. add nonunique()

    @cjprybol
    cjprybol committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    53774f5 View commit details
    Browse the repository at this point in the history

  2. commit join.jl merge for Alyst to debug

    @cjprybol
    cjprybol committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    2adc883 View commit details
    Browse the repository at this point in the history

  3. make the easy changes requested during review

    @cjprybol
    cjprybol committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    d52c791 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. add docstrings to row permutation functions

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    5e9664a View commit details
    Browse the repository at this point in the history

  2. clarify error message

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    e1b4d0e View commit details
    Browse the repository at this point in the history

  3. remove unused function

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    74c36d1 View commit details
    Browse the repository at this point in the history

  4. update function to use isequal(a::Nullable, b::Nullable) from base

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    de09a5c View commit details
    Browse the repository at this point in the history

  5. frame -> table

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    160be5c View commit details
    Browse the repository at this point in the history

  6. update merge based on helpful diff 

    see: https://github.com/alyst/DataFrames.jl/pull/1/files
    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    7f28a14 View commit details
    Browse the repository at this point in the history

  7. pass all tests that don't use Categorical

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    61bf607 View commit details
    Browse the repository at this point in the history

  8. added back commented out functions

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    6147d0c View commit details
    Browse the repository at this point in the history

  9. minor cleanup

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    bab097f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into cjp/alyst-groupby

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    cdac010 View commit details
    Browse the repository at this point in the history

  11. more changes suggested during review

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    8cf4a67 View commit details
    Browse the repository at this point in the history

  12. use explicit vcat, indendation, parentheses

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    199f96b View commit details
    Browse the repository at this point in the history

  13. more indentation

    @cjprybol
    cjprybol committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    f3b06a3 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. fix test/join.jl errors using resize! in 

    JuliaData/CategoricalArrays.jl#29
    @cjprybol
    cjprybol committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    8308879 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2017

  1. passing all tests!

    @cjprybol
    cjprybol committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    1c842dc View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. update categorical Arrays version

    @cjprybol
    cjprybol committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    637b8cf View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. incorporate edits suggested during review

    @cjprybol
    cjprybol committed Mar 1, 2017
    1 Configuration menu
    Copy the full SHA
    49d6328 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2017

  1. more fixes

    @cjprybol
    cjprybol committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    b6c1f98 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2017

  1. added tests and trimmed unneccessary functions

    @cjprybol
    cjprybol committed Mar 4, 2017
    Configuration menu
    Copy the full SHA
    839c558 View commit details
    Browse the repository at this point in the history

  2. update new function name

    @cjprybol
    cjprybol committed Mar 4, 2017
    Configuration menu
    Copy the full SHA
    46aaae2 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2017

  1. revert code deletions and address most comments

    @cjprybol
    cjprybol committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    01b3ce8 View commit details
    Browse the repository at this point in the history

  2. revert bad edit, function is untested

    @cjprybol
    cjprybol committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    7b9b8e2 View commit details
    Browse the repository at this point in the history

  3. revert some changes, clean up tests

    @cjprybol
    cjprybol committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    7fe0389 View commit details
    Browse the repository at this point in the history

  4. change docstring to comment

    @cjprybol
    cjprybol committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    cf0486a View commit details
    Browse the repository at this point in the history