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

Merge 4.0.5-stable branch that contains taxonomy rollup changes #40

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

jtklein
Copy link
Contributor

@jtklein jtklein commented Nov 20, 2024

No description provided.

jtklein and others added 3 commits November 1, 2024 16:20
* apply a cutoff before taxonomy cutoff

from 550ms per frame to 120ms per frame on my iPhone 13 pro

* On Android Implement taxonomy rollup only for nodes with wanted scores

* Expose taxonomy cutoff threshold to JS side

* Destructure taxonomyRollupCutoff out of options

* Update VCPTaxonomy.m

* Set taxonomy rollup cutoff value from plugin

* Update comment

* Stub for option validation

* Include node also if exactly on the threshold score

This enables us to set a threshold of 0 for not filtering out any nodes at all.

* Default threshold to 0 on iOS

* Comments

* Also attach options to the stored result

* Log number of nodes that are in the final aggregated set

* Default to 0.0 on Android

* Inclusive check of threshold on Android

* Log number of nodes in aggregate scores on Android

* Remove unnecessary null checks

* Fix bug with taxon filter on Android

When setting a taxon filter and removing it the frame processor was not removing the filter internally. This should fix that.

* Use null in example app instead of undefined as we do in Seek

* If a taxon filter is applied do not aggregate scores of filtered out nodes

Should improve cv speed on Android

* Do not include inner nodes if their summed score is 0

* apply a cutoff before taxonomy cutoff

from 550ms per frame to 120ms per frame on my iPhone 13 pro

* On Android Implement taxonomy rollup only for nodes with wanted scores

* Expose taxonomy cutoff threshold to JS side

* Destructure taxonomyRollupCutoff out of options

* Update VCPTaxonomy.m

* Set taxonomy rollup cutoff value from plugin

* Update comment

* Stub for option validation

* Include node also if exactly on the threshold score

This enables us to set a threshold of 0 for not filtering out any nodes at all.

* Default threshold to 0 on iOS

* Comments

* Also attach options to the stored result

* Log number of nodes that are in the final aggregated set

* Default to 0.0 on Android

* Inclusive check of threshold on Android

* Log number of nodes in aggregate scores on Android

* Remove unnecessary null checks

* Fix bug with taxon filter on Android

When setting a taxon filter and removing it the frame processor was not removing the filter internally. This should fix that.

* Use null in example app instead of undefined as we do in Seek

* If a taxon filter is applied do not aggregate scores of filtered out nodes

Should improve cv speed on Android

* Do not include inner nodes if their summed score is 0

* Refactor checking of option

* Fix log

* Also send back full options dict for predictions from image

* Fix comment

* Remove assert because validation happens on JS side

* Only add scores higher 0 also on iOS

* Move property taxonomyRollupCutoff to header file

* Return timeElapsed to caller

* Add timeElapsed to all possible cv results

* Add timeElapsed to result interface

---------

Co-authored-by: Alex Shepard <[email protected]>
@jtklein jtklein merged commit 106cfd6 into main Nov 20, 2024
3 checks passed
@jtklein jtklein deleted the 4.0.5-stable branch November 20, 2024 20:35
@jtklein jtklein restored the 4.0.5-stable branch November 20, 2024 20:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant