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

Fix/aggregation #271

Merged
merged 5 commits into from
May 22, 2023
Merged

Fix/aggregation #271

merged 5 commits into from
May 22, 2023

Conversation

LucaMarconato
Copy link
Member

No description provided.

@LucaMarconato LucaMarconato marked this pull request as draft May 19, 2023 14:19
@@ -0,0 +1,62 @@
import contextlib
Copy link
Member Author

Choose a reason for hiding this comment

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

This file is entirely present in main, I just moved it from tests/test_dataloader/test_datasets.py to tests/dataloader/test_datasets.py

"""
values_centroids_squares = np.array([[x * 18, 0] for x in range(8)] + [[8 * 18 + 7, 0]] + [[0, 90], [50, 90]])
values_centroids_circles = np.array([[x * 18, 30] for x in range(8)] + [[8 * 18 + 7, 30]])
by_centroids_squares = np.array([[119, 15], [100, 90], [150, 90], [210, 15]])
Copy link
Member Author

Choose a reason for hiding this comment

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

New addition: added one extra by square and one extra by circle, the rest is identical as before, just moved between files.

@codecov
Copy link

codecov bot commented May 19, 2023

Codecov Report

Merging #271 (c0c1041) into main (4325b59) will increase coverage by 0.01%.
The diff coverage is 94.44%.

❗ Current head c0c1041 differs from pull request most recent head 1ab3361. Consider uploading reports for the commit 1ab3361 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #271      +/-   ##
==========================================
+ Coverage   89.85%   89.87%   +0.01%     
==========================================
  Files          36       36              
  Lines        4386     4404      +18     
==========================================
+ Hits         3941     3958      +17     
- Misses        445      446       +1     
Impacted Files Coverage Δ
src/spatialdata/models/_utils.py 90.00% <87.50%> (-0.11%) ⬇️
src/spatialdata/_core/operations/aggregate.py 90.00% <100.00%> (-0.11%) ⬇️
src/spatialdata/_core/query/spatial_query.py 91.88% <100.00%> (+0.13%) ⬆️
src/spatialdata/_io/io_points.py 100.00% <100.00%> (ø)

fix bug with categories and to_parquet(); add tests
@LucaMarconato LucaMarconato marked this pull request as ready for review May 20, 2023 17:38
@LucaMarconato
Copy link
Member Author

LucaMarconato commented May 20, 2023

Ready for review @giovp @kevinyamauchi

After also this small PR in spatialdata-io is merged scverse/spatialdata-io#40, then this one in spatialdata-notebooks can be merged directly scverse/spatialdata-notebooks#27

src/spatialdata/_core/operations/aggregate.py Outdated Show resolved Hide resolved
src/spatialdata/_core/query/spatial_query.py Show resolved Hide resolved
@LucaMarconato LucaMarconato merged commit a0063cc into main May 22, 2023
@LucaMarconato LucaMarconato deleted the fix/aggregation branch May 22, 2023 09:28
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.

2 participants