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.

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

[ENH] Merge MiniRocket and MiniRocketMultivariate #1708

Merged
merged 29 commits into from
Jun 24, 2024
Merged

Conversation

TonyBagnall
Copy link
Contributor

@TonyBagnall TonyBagnall commented Jun 19, 2024

merge these two transformers, part of #1699, deprecate multivariate version

based on advice from @baraline, tried merging just using the multivariate version and it worked. Will explore any performance hit later. Prior to #1698, Minirocket and Minirocket multvariate were about 2000 lines long. After this PR combined both will be under 400 lines.

It could be done better, but at this point, with the issue #208 over a year old, I just want to move things forward.

@TonyBagnall TonyBagnall added the transformations Transformations package label Jun 19, 2024
@aeon-actions-bot aeon-actions-bot bot added the enhancement New feature, improvement request or other non-bug code enhancement label Jun 19, 2024
@aeon-actions-bot
Copy link
Contributor

Thank you for contributing to aeon

I have added the following labels to this PR based on the title: [ $\color{#FEF1BE}{\textsf{enhancement}}$ ].
I would have added the following labels to this PR based on the changes made: [ $\color{#41A8F6}{\textsf{transformations}}$ ], however some package labels are already present.

The Checks tab will show the status of our automated tests. You can click on individual test runs in the tab or "Details" in the panel below to see more information if there is a failure.

If our pre-commit code quality check fails, any trivial fixes will automatically be pushed to your PR unless it is a draft.

Don't hesitate to ask questions on the aeon Slack channel if you have any.

PR CI actions

These checkboxes will add labels to enable/disable CI functionality for this PR. This may not take effect immediately, and a new commit may be required to run the new configuration.

  • Run pre-commit checks for all files
  • Run all pytest tests and configurations
  • Run all notebook example tests
  • Run numba-disabled codecov tests
  • Stop automatic pre-commit fixes (always disabled for drafts)

Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@baraline
Copy link
Member

Is there a specific reason why you introduce two versions of fit/transform (multi, uni) ? Couldn't we use the multivariate code with n_channels=1 ?
Otherwise, the rest looks good to me at first glance.

@TonyBagnall TonyBagnall marked this pull request as draft June 22, 2024 14:34
@TonyBagnall
Copy link
Contributor Author

TonyBagnall commented Jun 22, 2024

Is there a specific reason why you introduce two versions of fit/transform (multi, uni) ? Couldn't we use the multivariate code with n_channels=1 ? Otherwise, the rest looks good to me at first glance.

because its very complicated and I was looking for the simplest solution. Anything more can be done after imo. IIRC angus tried that but there were problems

@TonyBagnall
Copy link
Contributor Author

TonyBagnall commented Jun 22, 2024

Is there a specific reason why you introduce two versions of fit/transform (multi, uni) ? Couldn't we use the multivariate code with n_channels=1 ? Otherwise, the rest looks good to me at first glance.

I'll try it though .... seems to work! This code has sat here for two or three years :) I'll rerun with full coverage and testing

@TonyBagnall TonyBagnall added full pytest actions Run the full pytest suite on a PR codecov actions Run the codecov action on a PR labels Jun 22, 2024
@TonyBagnall TonyBagnall marked this pull request as ready for review June 22, 2024 19:21
Copy link
Member

@baraline baraline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non blocking comments, but computing logic looks fine, test are passing even without numba, so LGTM

@TonyBagnall TonyBagnall merged commit 32e8993 into main Jun 24, 2024
22 checks passed
@TonyBagnall TonyBagnall deleted the ajb/minirocket branch June 24, 2024 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
codecov actions Run the codecov action on a PR enhancement New feature, improvement request or other non-bug code enhancement full pytest actions Run the full pytest suite on a PR transformations Transformations package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants