Skip to content

Commit

Permalink
Merge pull request #47 from astronomy-commons/rm-kdtree-gnomonic
Browse files Browse the repository at this point in the history
Remove previous implementation of kdtree x-match
  • Loading branch information
hombit authored Oct 31, 2023
2 parents 133b28f + e53a91c commit d514dfe
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 173 deletions.
8 changes: 0 additions & 8 deletions benchmarks/benchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import os

import lsdb
from lsdb.core.crossmatch.kdtree_gnomonic_match import KdTreeGnomonicCrossmatch

TEST_DIR = os.path.join(os.path.dirname(__file__), "..", "tests")
DATA_DIR_NAME = "data"
Expand All @@ -28,10 +27,3 @@ def time_kdtree_crossmatch():
small_sky = load_small_sky()
small_sky_xmatch = load_small_sky_xmatch()
small_sky.crossmatch(small_sky_xmatch).compute()


def time_kdtree_gnomonic_crossmatch():
"""Time computations are prefixed with 'time'."""
small_sky = load_small_sky()
small_sky_xmatch = load_small_sky_xmatch()
small_sky.crossmatch(small_sky_xmatch, algorithm=KdTreeGnomonicCrossmatch).compute()
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ dependencies = [
"pyarrow",
"deprecated",
"ipykernel", # Support for Jupyter notebooks
"scikit-learn",
"scipy", # kdtree
]

Expand Down
162 changes: 0 additions & 162 deletions src/lsdb/core/crossmatch/kdtree_gnomonic_match.py

This file was deleted.

3 changes: 1 addition & 2 deletions tests/lsdb/catalog/test_crossmatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
from hipscat.pixel_math.hipscat_id import HIPSCAT_ID_COLUMN

from lsdb.core.crossmatch.abstract_crossmatch_algorithm import AbstractCrossmatchAlgorithm
from lsdb.core.crossmatch.kdtree_gnomonic_match import KdTreeGnomonicCrossmatch
from lsdb.core.crossmatch.kdtree_match import KdTreeCrossmatch


@pytest.mark.parametrize("algo", [KdTreeCrossmatch, KdTreeGnomonicCrossmatch])
@pytest.mark.parametrize("algo", [KdTreeCrossmatch])
class TestCrossmatch:
@staticmethod
def test_kdtree_crossmatch(algo, small_sky_catalog, small_sky_xmatch_catalog, xmatch_correct):
Expand Down

0 comments on commit d514dfe

Please sign in to comment.