Skip to content
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.

Sign up for GitHub

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

Jump to bottom

(WIP) Generic DataFrame Math #6664

Open
wants to merge 42 commits into
base: feature/4.0
Choose a base branch
from
Open

(WIP) Generic DataFrame Math #6664

wants to merge 42 commits into from

Commits on May 9, 2023

  1. Change PrimitiveDataFrameColumnComputations to use Generic Math

    @JakeRadMSFT
    JakeRadMSFT committed May 9, 2023
    Configuration menu
    Copy the full SHA
    bdcb2c5 View commit details
    Browse the repository at this point in the history

  2. Clean up and reduce helpers

    @JakeRadMSFT
    JakeRadMSFT committed May 9, 2023
    Configuration menu
    Copy the full SHA
    0e00904 View commit details
    Browse the repository at this point in the history

  3. Clean up variables and consistency

    @JakeRadMSFT
    JakeRadMSFT committed May 9, 2023
    Configuration menu
    Copy the full SHA
    d8872b2 View commit details
    Browse the repository at this point in the history

  4. Simplify initialize code

    @JakeRadMSFT
    JakeRadMSFT committed May 9, 2023
    Configuration menu
    Copy the full SHA
    a29a5aa View commit details
    Browse the repository at this point in the history

  5. Update GroupBy Product test

    @JakeRadMSFT
    JakeRadMSFT committed May 9, 2023
    Configuration menu
    Copy the full SHA
    c4d2999 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Remove the alias types for now and get all tests pass.

    @JakeRadMSFT
    JakeRadMSFT committed May 10, 2023
    Configuration menu
    Copy the full SHA
    28f63f0 View commit details
    Browse the repository at this point in the history

  2. Get rid of DateTimeDateFrameColumn alias

    @JakeRadMSFT
    JakeRadMSFT committed May 10, 2023
    Configuration menu
    Copy the full SHA
    0e89dd0 View commit details
    Browse the repository at this point in the history

  3. Get rid of converters

    @JakeRadMSFT
    JakeRadMSFT committed May 10, 2023
    Configuration menu
    Copy the full SHA
    b5de012 View commit details
    Browse the repository at this point in the history

  4. Convert ColumnArithmetic to generics

    @JakeRadMSFT
    JakeRadMSFT committed May 10, 2023
    Configuration menu
    Copy the full SHA
    53ef787 View commit details
    Browse the repository at this point in the history

  5. Convert float/decimal/double versions of ColumnArithmetic to GenericMath

    @JakeRadMSFT
    JakeRadMSFT committed May 10, 2023
    Configuration menu
    Copy the full SHA
    4f56d89 View commit details
    Browse the repository at this point in the history

  6. Remove all TT files.

    @JakeRadMSFT
    JakeRadMSFT committed May 10, 2023
    Configuration menu
    Copy the full SHA
    c42c1e2 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge remote-tracking branch 'origin/main' into u/jakerad/generic-math

    @JakeRadMSFT
    JakeRadMSFT committed May 11, 2023
    Configuration menu
    Copy the full SHA
    9836b30 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Fix using ToList on Row Collection

    @asmirnov82
    asmirnov82 committed May 15, 2023
    Configuration menu
    Copy the full SHA
    e7f9daf View commit details
    Browse the repository at this point in the history

  2. Fix DataFrame bounds checking on indexing elements

    @asmirnov82
    asmirnov82 committed May 15, 2023
    Configuration menu
    Copy the full SHA
    f4d3a6e View commit details
    Browse the repository at this point in the history

Commits on May 20, 2023

  1. Merge pull request #2 from JakeRadMSFT/u/jakerad/generic-math 

    Take jakerad/generic_math changes without conflicts
    @asmirnov82
    asmirnov82 authored May 20, 2023
    Configuration menu
    Copy the full SHA
    f91c6bf View commit details
    Browse the repository at this point in the history

  2. Fix build of Microsoft.Data.Analysis.Tests

    @asmirnov82
    asmirnov82 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    c1fc16e View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into jakerad_generic_math 

    # Conflicts:
#	src/Microsoft.Data.Analysis/DataFrame.IO.cs
#	test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj
    @asmirnov82
    asmirnov82 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    f551fd1 View commit details
    Browse the repository at this point in the history

  4. Fix merge issues

    @asmirnov82
    asmirnov82 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    c080c46 View commit details
    Browse the repository at this point in the history

  5. Fix the behavior or column SetName method

    @asmirnov82
    asmirnov82 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    c4388dc View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

  1. Merge branch 'fix_utility_parity_foreach' into jakerad_generic_math

    @asmirnov82
    asmirnov82 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    9218375 View commit details
    Browse the repository at this point in the history

  2. Merge commit 'f4d3a6ecac44fbc83e121c9476fe240bf9329316' into jakerad_… 

    …generic_math
    @asmirnov82
    asmirnov82 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    8cd3d39 View commit details
    Browse the repository at this point in the history

  3. Reset RowCount to zero, when DataFrame is empty 

    # Conflicts:
#	src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs
#	test/Microsoft.Data.Analysis.Tests/DataFrameTests.cs
    @asmirnov82
    asmirnov82 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    92e2d72 View commit details
    Browse the repository at this point in the history

  4. Remove redundant column names collection from DataFrameColumnCollection 

    # Conflicts:
#	src/Microsoft.Data.Analysis/DataFrameColumnCollection.cs
    @asmirnov82
    asmirnov82 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    e88b642 View commit details
    Browse the repository at this point in the history

  5. Add missing implementation for datetime relevant arrow type 

    # Conflicts:
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs
    @asmirnov82
    asmirnov82 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    91d0f1f View commit details
    Browse the repository at this point in the history

  6. Fix DataFrame Merge issue 

    # Conflicts:
#	src/Microsoft.Data.Analysis/BooleanDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/ByteDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/CharDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/DateTimeDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/DecimalDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/DoubleDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/Int16DataFrameColumn.cs
#	src/Microsoft.Data.Analysis/Int32DataFrameColumn.cs
#	src/Microsoft.Data.Analysis/Int64DataFrameColumn.cs
#	src/Microsoft.Data.Analysis/SByteDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/SingleDataFrameColumn.cs
#	src/Microsoft.Data.Analysis/UInt16DataFrameColumn.cs
#	src/Microsoft.Data.Analysis/UInt32DataFrameColumn.cs
#	src/Microsoft.Data.Analysis/UInt64DataFrameColumn.cs
#	test/Microsoft.Data.Analysis.Tests/DataFrame.IOTests.cs
    @asmirnov82
    asmirnov82 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    4ebddeb View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Clean switch by type in binary operations 

    # Conflicts:
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.BinaryOperations.tt
    @asmirnov82
    asmirnov82 committed May 25, 2023
    Configuration menu
    Copy the full SHA
    da2cb99 View commit details
    Browse the repository at this point in the history

  2. Simplify getting mutable buffers 

    # Conflicts:
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnArithmetic.cs
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnArithmetic.tt
    @asmirnov82
    asmirnov82 committed May 25, 2023
    Configuration menu
    Copy the full SHA
    1de06be View commit details
    Browse the repository at this point in the history

  3. Don't convert buffer to mutable if it not required 

    # Conflicts:
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnArithmetic.cs
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnArithmetic.tt
    @asmirnov82
    asmirnov82 committed May 25, 2023
    Configuration menu
    Copy the full SHA
    6be198d View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Merge remote-tracking branch 'origin/main' into u/jakerad/generic-math

    @JakeRadMSFT
    JakeRadMSFT committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    2ba8944 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into jakerad_generic_math

    @JakeRadMSFT
    JakeRadMSFT committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    a20d6e0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'u/jakerad/generic-math' into jakerad_generic_math

    @JakeRadMSFT
    JakeRadMSFT authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    b78c0a7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from asmirnov82/jakerad_generic_math 

    Integrate latest dataframe changes from asmirnov/machinelearning into local branch
    @JakeRadMSFT
    JakeRadMSFT authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    d24a594 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge branch 'feature/4.0' into u/jakerad/generic-math

    @JakeRadMSFT
    JakeRadMSFT committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    373fc04 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Provide ability to filter by null value 

    # Conflicts:
#	src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperations.tt
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.BinaryOperations.cs
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.BinaryOperations.tt
    @asmirnov82
    asmirnov82 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    d3a0aae View commit details
    Browse the repository at this point in the history

  2. Add comments

    @asmirnov82
    asmirnov82 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    ab7e698 View commit details
    Browse the repository at this point in the history

  3. Fix merge issues (broken build)

    @asmirnov82
    asmirnov82 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    b0daf74 View commit details
    Browse the repository at this point in the history

  4. Step 1 

    # Conflicts:
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.Computations.tt
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnComputations.cs
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnComputations.tt
    @asmirnov82
    asmirnov82 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    663db1f View commit details
    Browse the repository at this point in the history

  5. Cherry pick Step 2 commit from 6733

    @asmirnov82
    asmirnov82 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    33b6432 View commit details
    Browse the repository at this point in the history

  6. Fixed code review findings 

    # Conflicts:
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnComputations.cs
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnComputations.tt
    @asmirnov82
    asmirnov82 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    11b5d6f View commit details
    Browse the repository at this point in the history

  7. Cherry pick PR 6724 (fix dataframe arithmetics for columns having sev… 

    …eral value buffers)

# Conflicts:
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnArithmetic.cs
#	src/Microsoft.Data.Analysis/PrimitiveDataFrameColumnArithmetic.tt
    @asmirnov82
    asmirnov82 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    cb39ed8 View commit details
    Browse the repository at this point in the history

  8. Fix tests

    @JakeRadMSFT
    JakeRadMSFT committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    2856d3a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3 from asmirnov82/jakerad_generic_math 

    Integrated 6733 Jakerad generic math
    @JakeRadMSFT
    JakeRadMSFT authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    1d57c45 View commit details
    Browse the repository at this point in the history