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

Matrices from formulas #267

Merged
merged 74 commits into from
Aug 15, 2023
Merged

Matrices from formulas #267

merged 74 commits into from
Aug 15, 2023

Commits on Jun 15, 2023

  1. Add an experimental tabmat materializer class

    @stanmart
    stanmart committed Jun 15, 2023
    14 Configuration menu
    Copy the full SHA
    bd2a2d3 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Nicer way of handling interactions

    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    100bdb8 View commit details
    Browse the repository at this point in the history

  2. Have proper column names [skip ci]

    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    85da52e View commit details
    Browse the repository at this point in the history

  3. Make dummy ordering consistent with pandas [skip ci]

    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    ce7dfaa View commit details
    Browse the repository at this point in the history

  4. Fix mistake in categorical interactions [skip ci]

    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    d23cca5 View commit details
    Browse the repository at this point in the history

  5. Add formulaic to environment files 

    Have not added to the conda recipe yet.
Should probably be optional.
    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    55b01bf View commit details
    Browse the repository at this point in the history

  6. Add from_formula constructor

    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    5b7da3c View commit details
    Browse the repository at this point in the history

  7. Add some tests

    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    51ecfc2 View commit details
    Browse the repository at this point in the history

  8. Add more tests

    @stanmart
    stanmart committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    ffa4955 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Major refactoring 

     - simplify categorical interactions
 - NaNs in categoricals should be handled correctly
 - parity with formulaic in categorical names
    @stanmart
    stanmart committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    a54a1a3 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Make name formatting custommizable 

     - interaction_separator
 - categorical_format
 - intercept_name
    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    6157acd View commit details
    Browse the repository at this point in the history

  2. Add formulaic to conda recipe

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    c9959cc View commit details
    Browse the repository at this point in the history

  3. Implement C() function to convert to categoricals

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    64af944 View commit details
    Browse the repository at this point in the history

  4. Auto-convert strings to categories

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    8abca00 View commit details
    Browse the repository at this point in the history

  5. Fix C() not working from materializer interface

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    124d47c View commit details
    Browse the repository at this point in the history

  6. Add the pandasmaterializer tests from formulaic

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    bb1faf6 View commit details
    Browse the repository at this point in the history

  7. Add formulaic to setup.py deps

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    5716573 View commit details
    Browse the repository at this point in the history

  8. Implement suggestions from code review

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    21fcdff View commit details
    Browse the repository at this point in the history

  9. Clean up code 

     - Add docstrings
 - Add type hints
 - Rename some classes
    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    eaf968e View commit details
    Browse the repository at this point in the history

  10. Pin formulaic minimum version

    @stanmart
    stanmart committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    7cb70f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Add support for architectures not supported by xsimd (#262)

    @xhochy @stanmart
    xhochy authored and stanmart committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    fb629c6 View commit details
    Browse the repository at this point in the history

  2. Release 3.1.9 (#263)

    @xhochy @stanmart
    xhochy authored and stanmart committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    9fb2993 View commit details
    Browse the repository at this point in the history

  3. Pre-commit autoupdate (#264) 

    Co-authored-by: quant-ranger[bot] <132915763+quant-ranger[bot]@users.noreply.github.com>
    @quant-ranger @stanmart
    quant-ranger[bot] authored and stanmart committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    1ad6a93 View commit details
    Browse the repository at this point in the history

  4. Add params for density and cardinality thresholds

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

  5. Skip python 3.6 build

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

  6. Refactor to avoid circular imports

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

  7. Merge branch 'main' into formula

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

Commits on Jun 26, 2023

  1. Interaction of dropped and NA is dropped

    @stanmart
    stanmart committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    ef84e7d View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Add type hint for context

    @stanmart
    stanmart committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    927b2be View commit details
    Browse the repository at this point in the history

  2. Add unit tests for interactable vectors

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

  3. Add more checks

    @stanmart
    stanmart committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    20b617b View commit details
    Browse the repository at this point in the history

  4. Change argument name

    @stanmart
    stanmart committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    010ad8e View commit details
    Browse the repository at this point in the history

  5. Make C() stateful (remember levels)

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

  6. Add test for categorizer state

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

Commits on Jun 28, 2023

  1. More correct handling of encoding categoricals

    @stanmart
    stanmart committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    695de6f View commit details
    Browse the repository at this point in the history

  2. Make adding an intercept implicitly parametrizable 

    Default is False
    @stanmart
    stanmart committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    064daac View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Add na_action parameter to constrictor

    @stanmart
    stanmart committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    55ae36f View commit details
    Browse the repository at this point in the history

  2. Add test for sparse numerical columns

    @stanmart
    stanmart committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    5f253a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Add option to not add the constant column

    @stanmart
    stanmart committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    9caa6df View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Pre-commit autoupdate (#274)

    @quant-ranger @stanmart
    quant-ranger[bot] authored and stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    f180075 View commit details
    Browse the repository at this point in the history

  2. Pre-commit autoupdate (#276) 

    Co-authored-by: quant-ranger[bot] <132915763+quant-ranger[bot]@users.noreply.github.com>
    @quant-ranger @stanmart
    quant-ranger[bot] authored and stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    5eaba13 View commit details
    Browse the repository at this point in the history

  3. Bump pypa/gh-action-pypi-publish from 1.8.6 to 1.8.7 (#277) 

    Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.6 to 1.8.7.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.8.6...v1.8.7)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @stanmart
    dependabot[bot] authored and stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6fb5a96 View commit details
    Browse the repository at this point in the history

  4. Bump pypa/gh-action-pypi-publish from 1.8.7 to 1.8.8 (#279) 

    Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.7 to 1.8.8.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.8.7...v1.8.8)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @stanmart
    dependabot[bot] authored and stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a473577 View commit details
    Browse the repository at this point in the history

  5. Bump pypa/cibuildwheel from 2.13.1 to 2.14.1 (#280) 

    Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.13.1 to 2.14.1.
- [Release notes](https://github.com/pypa/cibuildwheel/releases)
- [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md)
- [Commits](pypa/cibuildwheel@v2.13.1...v2.14.1)

---
updated-dependencies:
- dependency-name: pypa/cibuildwheel
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot @stanmart
    dependabot[bot] authored and stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    1084b53 View commit details
    Browse the repository at this point in the history

  6. Minimal implementation (tests green)

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ce96be8 View commit details
    Browse the repository at this point in the history

  7. Remove sum method and rely on np.sum

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6fdde75 View commit details
    Browse the repository at this point in the history

  8. Force DenseMatrix to always be 2-dimensional

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a8cbf96 View commit details
    Browse the repository at this point in the history

  9. Add __repr__ and __str__ methods

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    b80cdc1 View commit details
    Browse the repository at this point in the history

  10. Fix as_mx

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    8983f4d View commit details
    Browse the repository at this point in the history

  11. Fix ufunc return value

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    16e0217 View commit details
    Browse the repository at this point in the history

  12. Wrap SparseMatrix, too

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    272ba65 View commit details
    Browse the repository at this point in the history

  13. Demo of how the ufunc interface can be implemented

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7775b79 View commit details
    Browse the repository at this point in the history

  14. Do not subclass csc_matrix

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a493e03 View commit details
    Browse the repository at this point in the history

  15. Improve the performance of from_pandas in the case of low-cardinali… 

    …ty categoricals (#275)

* Improve the performance of `from_pandas`

* Update changelog according to review
    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    008dfa3 View commit details
    Browse the repository at this point in the history

  16. Add benchmark data to .gitignore (#282)

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    407a12f View commit details
    Browse the repository at this point in the history

  17. Demonstrate binary ufuncs for sparse

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ac9c121 View commit details
    Browse the repository at this point in the history

  18. Add tocsc method

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    95bc477 View commit details
    Browse the repository at this point in the history

  19. Fix type checks

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a6173f5 View commit details
    Browse the repository at this point in the history

  20. Minor improvements

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    35e7330 View commit details
    Browse the repository at this point in the history

  21. ufunc support for categoricals

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    aa264df View commit details
    Browse the repository at this point in the history

  22. Remove __array_ufunc__ interface

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    51d31e5 View commit details
    Browse the repository at this point in the history

  23. Remove numpy operator mixin

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    86e3178 View commit details
    Browse the repository at this point in the history

  24. Add hstack function

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    e4bb2ea View commit details
    Browse the repository at this point in the history

  25. Add method for unpacking underlying array

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    17c36ca View commit details
    Browse the repository at this point in the history

  26. Add __matmul__ methods to SparseMatrix

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9dd638d View commit details
    Browse the repository at this point in the history

  27. Stricter and more consistent indexing

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ba2b70e View commit details
    Browse the repository at this point in the history

  28. Be consistent when instantiating from 1d arrays

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9b04f8c View commit details
    Browse the repository at this point in the history

  29. Adjust tests to work with v4

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    5c064c2 View commit details
    Browse the repository at this point in the history

  30. Fix type hints

    @stanmart
    stanmart committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    f1ba304 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Merge branch 'tabmat-v4' into formula

    @stanmart
    stanmart committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    01e20b3 View commit details
    Browse the repository at this point in the history

  2. Add changelog entry

    @stanmart
    stanmart committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    603293b View commit details
    Browse the repository at this point in the history

  3. term and column names for formula-based matrices

    @stanmart
    stanmart committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    3686371 View commit details
    Browse the repository at this point in the history

  4. Fix handling of formula-based names

    @stanmart
    stanmart committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    7aa36a4 View commit details
    Browse the repository at this point in the history

  5. Add tests for formula-based names

    @stanmart
    stanmart committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    c9cfc0f View commit details
    Browse the repository at this point in the history