week8 implementation

CMakeLists.txt

@@ -7,45 +7,32 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(PYBIND11_FINDPYTHON ON)
 find_package(pybind11 REQUIRED)
 
-enable_testing()
-include(FetchContent)
-FetchContent_Declare(
-    googletest
-    URL https://github.com/google/googletest/archive/refs/tags/v1.15.2.zip
-    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-)
-set(INSTALL_GTEST OFF)
-FetchContent_MakeAvailable(googletest)
-include(GoogleTest)
-
 add_library(rtse_core STATIC
     core/rtree.cpp
 )
-set_target_properties(rtse_core PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(rtse_core PUBLIC ${PROJECT_SOURCE_DIR}/core)
+set_target_properties(rtse_core PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 pybind11_add_module(rtse binding/pybind.cpp)
 target_link_libraries(rtse PRIVATE rtse_core)
-target_include_directories(rtse PRIVATE ${pybind11_INCLUDE_DIRS})
 set_target_properties(rtse PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
 )
-add_custom_command(TARGET rtse POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:rtse>
-            ${CMAKE_BINARY_DIR}/$<TARGET_FILE_NAME:rtse>
-)
 
-add_executable(dummy tests/test_dummy.cpp)
-set_target_properties(dummy PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests"
+enable_testing()
+include(FetchContent)
+FetchContent_Declare(
+    googletest
+    URL https://github.com/google/googletest/archive/refs/tags/v1.15.2.zip
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
+FetchContent_MakeAvailable(googletest)
+include(GoogleTest)
 
 add_executable(test_rtree tests/test_rtree.cpp)
 target_link_libraries(test_rtree PRIVATE GTest::gtest_main)
 target_link_libraries(test_rtree PRIVATE rtse_core)
 set_target_properties(test_rtree PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests/"    
 )
-
 gtest_discover_tests(test_rtree)

binding/pybind.cpp

@@ -25,18 +25,12 @@ PYBIND11_MODULE(rtse, m)
     py::class_<rtse::Box2>(m, "Box2", "Axis-aligned bounding box [min, max].")
         .def(py::init<>())
         .def(py::init<const rtse::Point2 &, const rtse::Point2 &>(),
-             py::arg("pmin"), py::arg("pmax"))
+             py::arg("min"), py::arg("max"))
         .def_property_readonly("min", &rtse::Box2::min,
                                py::return_value_policy::reference_internal)
         .def_property_readonly("max", &rtse::Box2::max,
                                py::return_value_policy::reference_internal)
-        .def_property_readonly("is_empty", &rtse::Box2::is_empty)
-        .def_static("from_point", &rtse::Box2::from_point, py::arg("p"))
-        .def("area", &rtse::Box2::area)
         .def("overlap", &rtse::Box2::overlap, py::arg("other"))
-        .def_static("merge", &rtse::Box2::merge, py::arg("box1"),
-                    py::arg("box2"))
-        .def("enlarge_area", &rtse::Box2::enlarge_area, py::arg("other"))
         .def(py::self == py::self)
         .def(py::self != py::self)
         .def("__repr__",

core/rtree.h

@@ -64,10 +64,10 @@ class RTree
   public:
     RTree();
     ~RTree();
-    // RTree(const RTree&) = delete;
-    // RTree& operator=(const RTree&) = delete;
-    // RTree(RTree&&) = delete;
-    // RTree& operator=(RTree&&) = delete;
+    RTree(const RTree&) = delete;
+    RTree& operator=(const RTree&) = delete;
+    RTree(RTree&&) = delete;
+    RTree& operator=(RTree&&) = delete;
     void insert(const Box2 &box, int id);
     void erase(int id);
     void update(int id, const Box2 &new_box);