From bee47655b32f493d67b5cdad3b676552c50a3f9a Mon Sep 17 00:00:00 2001 From: TANG ZHIXIONG Date: Sat, 9 Dec 2023 19:21:01 +0800 Subject: [PATCH] fix --- .github/workflows/wheels.yml | 1 - CMakeLists.txt | 3 +++ src/bindings/pybind11_network.cpp | 15 ++++++++++++++- tests/test_basic.py | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1057ad2..02d6e5d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -6,7 +6,6 @@ on: push: branches: - master - - tzx/231207 release: types: - published diff --git a/CMakeLists.txt b/CMakeLists.txt index ed30fe4..6627f7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,9 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_CXX_STANDARD 17) +# TODO +# add_definitions(-DNANO_FMM_DISABLE_UNORDERED_DENSE=0) + if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) endif() diff --git a/src/bindings/pybind11_network.cpp b/src/bindings/pybind11_network.cpp index e0f3221..7b0bd14 100644 --- a/src/bindings/pybind11_network.cpp +++ b/src/bindings/pybind11_network.cpp @@ -114,7 +114,7 @@ void bind_network(py::module &m) py::class_(m, "Network", py::module_local()) // // - .def(py::init(), py::kw_only(), "is_wgs84"_a) + .def(py::init(), py::kw_only(), "is_wgs84"_a = true) .def("is_wgs84", &Network::is_wgs84) // .def("add_road", &Network::add_road, "geom"_a, py::kw_only(), "id"_a) @@ -189,6 +189,19 @@ void bind_network(py::module &m) py::class_(m, "Indexer", py::module_local()) // .def(py::init<>()) + .def("contains", + py::overload_cast(&Indexer::contains, py::const_), "id"_a) + .def("contains", + py::overload_cast(&Indexer::contains, + py::const_), + "id"_a) + .def("get_id", py::overload_cast(&Indexer::get_id, py::const_), + "id"_a) + .def("get_id", + py::overload_cast(&Indexer::get_id, + py::const_), + "id"_a) + // .def("id", py::overload_cast(&Indexer::id), "id"_a) .def("id", py::overload_cast(&Indexer::id), "id"_a) .def("index", diff --git a/tests/test_basic.py b/tests/test_basic.py index 7324f9b..05f9842 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -637,7 +637,7 @@ def test_network_query(): assert network.is_wgs84() assert len(network.roads()) == 1016 assert isinstance(network.roads(), list) - assert network.next_roads(1293) == [1297, 1298] + assert sorted(network.next_roads(1293)) == [1297, 1298] assert isinstance(network.next_roads(1293), list) assert network.prev_roads(1297) == [1293]